mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-17 09:23:48 +00:00
eth/catalyst: fix test issue
This commit is contained in:
parent
31e96f6317
commit
bdcdcbc370
1 changed files with 3 additions and 0 deletions
|
|
@ -65,6 +65,9 @@ func generateMergeChain(n int, merged bool) (*core.Genesis, []*types.Block) {
|
||||||
if merged {
|
if merged {
|
||||||
config.TerminalTotalDifficulty = common.Big0
|
config.TerminalTotalDifficulty = common.Big0
|
||||||
config.MergeNetsplitBlock = common.Big0
|
config.MergeNetsplitBlock = common.Big0
|
||||||
|
} else {
|
||||||
|
// When merged==false, the tests expect the next block to enter the merge.
|
||||||
|
config.MergeNetsplitBlock = big.NewInt(int64(n + 1))
|
||||||
}
|
}
|
||||||
|
|
||||||
genesis := &core.Genesis{
|
genesis := &core.Genesis{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue