Skip to content

Commit 22c355b

Browse files
committed
core/txpool/legacypool: narrow down the scope of the variable ethereum#27471
1 parent 71f929d commit 22c355b

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
@@ -1355,7 +1355,6 @@ func (pool *LegacyPool) reset(oldHead, newHead *types.Header) {
13551355
log.Debug("Skipping deep transaction reorg", "depth", depth)
13561356
} else {
13571357
// Reorg seems shallow enough to pull in all transactions into memory
1358-
var discarded, included types.Transactions
13591358
var (
13601359
rem = pool.chain.GetBlock(oldHead.Hash(), oldHead.Number.Uint64())
13611360
add = pool.chain.GetBlock(newHead.Hash(), newHead.Number.Uint64())
@@ -1376,6 +1375,7 @@ func (pool *LegacyPool) reset(oldHead, newHead *types.Header) {
13761375
"old", oldHead.Hash(), "oldnum", oldNum, "new", newHead.Hash(), "newnum", newNum)
13771376
// We still need to update the current state s.th. the lost transactions can be readded by the user
13781377
} else {
1378+
var discarded, included types.Transactions
13791379
for rem.NumberU64() > add.NumberU64() {
13801380
discarded = append(discarded, rem.Transactions()...)
13811381
if rem = pool.chain.GetBlock(rem.ParentHash(), rem.NumberU64()-1); rem == nil {

0 commit comments

Comments
 (0)