Skip to content

Commit e764d84

Browse files
authored
core/txpool/legacypool: narrow down the scope of the variable ethereum#27471 (#1910)
1 parent 6d4670a commit e764d84

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

core/txpool/legacypool/legacypool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1372,7 +1372,6 @@ func (pool *LegacyPool) reset(oldHead, newHead *types.Header) {
13721372
log.Debug("Skipping deep transaction reorg", "depth", depth)
13731373
} else {
13741374
// Reorg seems shallow enough to pull in all transactions into memory
1375-
var discarded, included types.Transactions
13761375
var (
13771376
rem = pool.chain.GetBlock(oldHead.Hash(), oldHead.Number.Uint64())
13781377
add = pool.chain.GetBlock(newHead.Hash(), newHead.Number.Uint64())
@@ -1401,6 +1400,7 @@ func (pool *LegacyPool) reset(oldHead, newHead *types.Header) {
14011400
log.Warn("Transaction pool reset with missing new head", "number", newHead.Number, "hash", newHead.Hash())
14021401
return
14031402
}
1403+
var discarded, included types.Transactions
14041404
for rem.NumberU64() > add.NumberU64() {
14051405
discarded = append(discarded, rem.Transactions()...)
14061406
if rem = pool.chain.GetBlock(rem.ParentHash(), rem.NumberU64()-1); rem == nil {

0 commit comments

Comments
 (0)