Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
Showing only changes of commit 0dbb3b1601 - Show all commits

View File

@ -75,7 +75,7 @@ func (p *Peer) broadcastTransactions() {
if done == nil && len(queue) > 0 {
// Pile transaction until we reach our allowed network limit
var (
hashes []common.Hash
hashesCount uint64
txs []*types.Transaction
size common.StorageSize
)
@ -84,9 +84,9 @@ func (p *Peer) broadcastTransactions() {
txs = append(txs, tx)
size += tx.Size()
}
hashes = append(hashes, queue[i])
hashesCount++
}
queue = queue[:copy(queue, queue[len(hashes):])]
queue = queue[:copy(queue, queue[hashesCount:])]
// If there's anything available to transfer, fire up an async writer
if len(txs) > 0 {