Fix merge issues

joshuacolvin0 · joshuacolvin0 · commit 1cb05188a54f · 2025-01-06T14:16:25.000-07:00
diff --git a/eth/tracers/api_test.go b/eth/tracers/api_test.go
@@ -1019,7 +1019,7 @@ func newTestMergedBackend(t *testing.T, n int, gspec *core.Genesis, generator fu
 		SnapshotLimit:     0,
 		TrieDirtyDisabled: true, // Archive mode
 	}
-	chain, err := core.NewBlockChain(backend.chaindb, cacheConfig, gspec, nil, backend.engine, vm.Config{}, nil, nil)
+	chain, err := core.NewBlockChain(backend.chaindb, cacheConfig, nil, gspec, nil, backend.engine, vm.Config{}, nil, nil)
 	if err != nil {
 		t.Fatalf("failed to create tester chain: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -1019,7 +1019,7 @@ func newTestMergedBackend(t testing.T, n int, gspec core.Genesis, generator fu`
`1019`	`1019`	`SnapshotLimit: 0,`
`1020`	`1020`	`TrieDirtyDisabled: true, // Archive mode`
`1021`	`1021`	`}`
`1022`		`- chain, err := core.NewBlockChain(backend.chaindb, cacheConfig, gspec, nil, backend.engine, vm.Config{}, nil, nil)`
	`1022`	`+ chain, err := core.NewBlockChain(backend.chaindb, cacheConfig, nil, gspec, nil, backend.engine, vm.Config{}, nil, nil)`
`1023`	`1023`	`if err != nil {`
`1024`	`1024`	`t.Fatalf("failed to create tester chain: %v", err)`
`1025`	`1025`	`}`