From bdcdcbc3703faa782c3efe7b4a4b38dfae984bb0 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Mon, 10 Feb 2025 19:45:33 +0100
Subject: [PATCH] eth/catalyst: fix test issue

---
 eth/catalyst/api_test.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go
index 52864cc9c2..fafd498f4a 100644
--- a/eth/catalyst/api_test.go
+++ b/eth/catalyst/api_test.go
@@ -65,6 +65,9 @@ func generateMergeChain(n int, merged bool) (*core.Genesis, []*types.Block) {
 	if merged {
 		config.TerminalTotalDifficulty = 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{