core: fix a merge fault (#26802)

karalabe · web-flow · commit 010189538e7e · 2023-03-03T12:11:39.000+02:00
diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go
@@ -118,7 +118,7 @@ func TestGenerateWithdrawalChain(t *testing.T) {
 	// enforce that withdrawal indexes are monotonically increasing from 0
 	var (
 		withdrawalIndex uint64
-		head            = blockchain.CurrentBlock().NumberU64()
+		head            = blockchain.CurrentBlock().Number.Uint64()
 	)
 	for i := 0; i < int(head); i++ {
 		block := blockchain.GetBlockByNumber(uint64(i))

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func TestGenerateWithdrawalChain(t *testing.T) {`
`118`	`118`	`// enforce that withdrawal indexes are monotonically increasing from 0`
`119`	`119`	`var (`
`120`	`120`	`withdrawalIndex uint64`
`121`		`- head = blockchain.CurrentBlock().NumberU64()`
	`121`	`+ head = blockchain.CurrentBlock().Number.Uint64()`
`122`	`122`	`)`
`123`	`123`	`for i := 0; i < int(head); i++ {`
`124`	`124`	`block := blockchain.GetBlockByNumber(uint64(i))`