Merge branch 'master' into pr_merge_apis

pull/1587/head
flicker-harmony 5 years ago committed by GitHub
commit 47c2e01324
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      node/node.go

@ -290,12 +290,10 @@ func (node *Node) AddPendingTransaction(newTx *types.Transaction) {
// AddPendingReceipts adds one receipt message to pending list. // AddPendingReceipts adds one receipt message to pending list.
func (node *Node) AddPendingReceipts(receipts *types.CXReceiptsProof) { func (node *Node) AddPendingReceipts(receipts *types.CXReceiptsProof) {
if node.NodeConfig.GetNetworkType() != nodeconfig.Mainnet {
node.pendingCXMutex.Lock() node.pendingCXMutex.Lock()
node.pendingCXReceipts = append(node.pendingCXReceipts, receipts) node.pendingCXReceipts = append(node.pendingCXReceipts, receipts)
node.pendingCXMutex.Unlock() node.pendingCXMutex.Unlock()
utils.Logger().Error().Int("totalPendingReceipts", len(node.pendingCXReceipts)).Msg("Got ONE more receipt message") utils.Logger().Error().Int("totalPendingReceipts", len(node.pendingCXReceipts)).Msg("Got ONE more receipt message")
}
} }
// Take out a subset of valid transactions from the pending transaction list // Take out a subset of valid transactions from the pending transaction list

Loading…
Cancel
Save