From e5d5318c8bf769dfb7f2fa6820fe5c2e02d18a44 Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Fri, 16 May 2025 19:26:32 +0530 Subject: [PATCH] fix: addressed comments --- consensus/beacon/consensus.go | 2 +- core/txpool/legacypool/legacypool_test.go | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/consensus/beacon/consensus.go b/consensus/beacon/consensus.go index c3c0ded84d..60103b880a 100644 --- a/consensus/beacon/consensus.go +++ b/consensus/beacon/consensus.go @@ -80,7 +80,7 @@ func isPostMerge(config *params.ChainConfig, blockNum uint64, timestamp uint64) mergedAtGenesis := config.TerminalTotalDifficulty != nil && config.TerminalTotalDifficulty.Sign() == 0 return mergedAtGenesis || config.MergeNetsplitBlock != nil && blockNum >= config.MergeNetsplitBlock.Uint64() || - config.ShanghaiBlock != nil + config.ShanghaiBlock != nil && blockNum >= config.ShanghaiBlock.Uint64() } // Author implements consensus.Engine, returning the verified author of the block. diff --git a/core/txpool/legacypool/legacypool_test.go b/core/txpool/legacypool/legacypool_test.go index fc4a831fbc..69ee0baf67 100644 --- a/core/txpool/legacypool/legacypool_test.go +++ b/core/txpool/legacypool/legacypool_test.go @@ -3168,8 +3168,6 @@ func TestPoolMultiAccountBatchInsertRace(t *testing.T) { pending = pool.Pending(txpool.PendingFilter{}) total = len(pending) - // _ = pool.Locals() - if total >= n { close(done)