From 8d95b10bb9c47b15749058d82bbfa58910625fd9 Mon Sep 17 00:00:00 2001 From: Sina Mahmoodi Date: Wed, 4 Sep 2024 13:07:40 +0200 Subject: [PATCH] fix supply withdrawals --- eth/tracers/live/supply_fill_test.go | 15 +++++++++------ eth/tracers/live/supply_test.go | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/eth/tracers/live/supply_fill_test.go b/eth/tracers/live/supply_fill_test.go index a0741b2617..73553f4ecc 100644 --- a/eth/tracers/live/supply_fill_test.go +++ b/eth/tracers/live/supply_fill_test.go @@ -197,25 +197,28 @@ func TestSupplyWithdrawals(t *testing.T) { }) } - out, _, chain, err := testSupplyTracer(t, gspec, withdrawalsBlockGenerationFunc) + out, db, chain, err := testSupplyTracer(t, gspec, withdrawalsBlockGenerationFunc) if err != nil { t.Fatalf("failed to test supply tracer: %v", err) } var ( head = chain.CurrentBlock() - expected = supplyInfo{ + expected = []supplyInfo{{ + Number: 0, + Hash: common.HexToHash("0x52f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703"), + ParentHash: common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000"), + }, { Issuance: &supplyInfoIssuance{ Withdrawals: big.NewInt(1337000000000), }, Number: 1, Hash: head.Hash(), ParentHash: head.ParentHash, - } - actual = out[expected.Number] + }} ) - - compareAsJSON(t, expected, actual) + compareAsJSON(t, expected, out) + writeArtifact(t, "withdrawals_cancun", db, chain, expected) } // Tests fund retrieval after contract's selfdestruct. diff --git a/eth/tracers/live/supply_test.go b/eth/tracers/live/supply_test.go index aa08b68cf4..f7fa754d44 100644 --- a/eth/tracers/live/supply_test.go +++ b/eth/tracers/live/supply_test.go @@ -30,7 +30,7 @@ func TestSupplyTracerBlockchain(t *testing.T) { t.Fatalf("failed to read testcase: %v", err) } if err := json.Unmarshal(blob, &testcases); err != nil { - t.Fatalf("failed to parse testcase: %v", err) + t.Fatalf("failed to parse testcase %s: %v", file.Name(), err) } for testname, test := range testcases { t.Run(fmt.Sprintf("%s/%s", camel(strings.TrimSuffix(file.Name(), ".json")), testname), func(t *testing.T) {