consensus/beacon: clarify isPreMerge

fjl · fjl · commit c7e4e89a5fc6 · 2025-02-10T18:52:04.000+01:00
diff --git a/consensus/beacon/consensus.go b/consensus/beacon/consensus.go
@@ -72,9 +72,12 @@ func New(ethone consensus.Engine) *Beacon {
 	return &Beacon{ethone: ethone}
 }
 
+// isPreMerge reports whether the given block number is assumed to be pre-merge.
+// Here we check the MergeNetsplitBlock to allow configuring networks with a PoW or
+// PoA chain for unit testing purposes.
 func isPreMerge(config *params.ChainConfig, block uint64) bool {
-	return !(config.TerminalTotalDifficulty != nil && config.TerminalTotalDifficulty.Sign() == 0) ||
-		(config.MergeNetsplitBlock != nil && block < config.MergeNetsplitBlock.Uint64())
+	mergedAtGenesis := config.TerminalTotalDifficulty != nil && config.TerminalTotalDifficulty.Sign() == 0
+	return !mergedAtGenesis && config.MergeNetsplitBlock != nil && block < config.MergeNetsplitBlock.Uint64()
 }
 
 // Author implements consensus.Engine, returning the verified author of the block.

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,12 @@ func New(ethone consensus.Engine) *Beacon {`
`72`	`72`	`return &Beacon{ethone: ethone}`
`73`	`73`	`}`
`74`	`74`
	`75`	`+// isPreMerge reports whether the given block number is assumed to be pre-merge.`
	`76`	`+// Here we check the MergeNetsplitBlock to allow configuring networks with a PoW or`
	`77`	`+// PoA chain for unit testing purposes.`
`75`	`78`	`func isPreMerge(config *params.ChainConfig, block uint64) bool {`
`76`		`- return !(config.TerminalTotalDifficulty != nil && config.TerminalTotalDifficulty.Sign() == 0) \|\|`
`77`		`- (config.MergeNetsplitBlock != nil && block < config.MergeNetsplitBlock.Uint64())`
	`79`	`+ mergedAtGenesis := config.TerminalTotalDifficulty != nil && config.TerminalTotalDifficulty.Sign() == 0`
	`80`	`+ return !mergedAtGenesis && config.MergeNetsplitBlock != nil && block < config.MergeNetsplitBlock.Uint64()`
`78`	`81`	`}`
`79`	`82`
`80`	`83`	`// Author implements consensus.Engine, returning the verified author of the block.`