From c883d37f3100ac4b7c208484c600e1674ef3d5b7 Mon Sep 17 00:00:00 2001 From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:27:53 -0600 Subject: [PATCH] Revert "graphql: fix race in withdrawals test (#27706)" This reverts commit c5cd16182521bde262cc0b4ab27abfb7203a8de8. --- graphql/graphql_test.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/graphql/graphql_test.go b/graphql/graphql_test.go index 4bbfb7251d..22d7181b0d 100644 --- a/graphql/graphql_test.go +++ b/graphql/graphql_test.go @@ -445,21 +445,19 @@ func newGQLService(t *testing.T, stack *node.Node, shanghai bool, gspec *core.Ge TrieTimeout: 60 * time.Minute, SnapshotCache: 5, } + ethBackend, err := eth.New(stack, ethConf) + if err != nil { + t.Fatalf("could not create eth backend: %v", err) + } var engine consensus.Engine = ethash.NewFaker() if shanghai { engine = beacon.NewFaker() chainCfg := gspec.Config chainCfg.TerminalTotalDifficultyPassed = true chainCfg.TerminalTotalDifficulty = common.Big0 - // GenerateChain will increment timestamps by 10. - // Shanghai upgrade at block 1. - shanghaiTime := uint64(5) + shanghaiTime := uint64(0) chainCfg.ShanghaiTime = &shanghaiTime } - ethBackend, err := eth.New(stack, ethConf) - if err != nil { - t.Fatalf("could not create eth backend: %v", err) - } // Create some blocks and import them chain, _ := core.GenerateChain(params.AllEthashProtocolChanges, ethBackend.BlockChain().Genesis(), engine, ethBackend.ChainDb(), genBlocks, genfunc)