forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: addressed comments

Browse source
This commit is contained in:
Pratik Patil 2025-05-16 19:26:32 +05:30
parent ca5b093605
commit e5d5318c8b
No known key found for this signature in database
GPG key ID: AFDCA496554874B3
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
consensus/beacon/consensus.go
View file

@ -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.

2
core/txpool/legacypool/legacypool_test.go
View file

@ -3168,8 +3168,6 @@ func TestPoolMultiAccountBatchInsertRace(t *testing.T) {
pending = pool.Pending(txpool.PendingFilter{})
total = len(pending)
// _ = pool.Locals()
if total >= n {
close(done)