core: fix a merge fault (#26802)

01018953 · Péter Szilágyi · GitHub · 19f74fa3 · 01018953
Unverified Commit 01018953 authored Mar 03, 2023 by Péter Szilágyi Committed by GitHub Mar 03, 2023
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

chain_makers_test.go core/chain_makers_test.go +1 -1

No files found.
--- 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))