forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 09:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth/tracers/live: move testdata + minor nits

Browse source
This commit is contained in:
Martin Holst Swende 2024-11-20 12:44:37 +01:00
parent 8296be8909
commit 7a18fdade2
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
8 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eth/tracers/live/supply_test.go
View file

@ -52,7 +52,7 @@ func (bt *blockTest) UnmarshalJSON(data []byte) error {
// The tests have been filled using the executable at
// eth/tracers/live/tests/supply_filler.go.
func TestSupplyTracerBlockchain(t *testing.T) {
dirPath := filepath.Join("tests", "supply")
dirPath := filepath.Join("testdata", "supply")
files, err := os.ReadDir(dirPath)
if err != nil {
t.Fatalf("failed to retrieve tracer test suite: %v", err)

0
eth/tracers/live/tests/supply/eip1559_burn.json → eth/tracers/live/testdata/supply/eip1559_burn.json vendored
View file

0
eth/tracers/live/tests/supply/genesis_alloc.json → eth/tracers/live/testdata/supply/genesis_alloc.json vendored
View file

0
eth/tracers/live/tests/supply/omitted_fields.json → eth/tracers/live/testdata/supply/omitted_fields.json vendored
View file

0
eth/tracers/live/tests/supply/selfdestruct.json → eth/tracers/live/testdata/supply/selfdestruct.json vendored
View file

0
eth/tracers/live/tests/supply/selfdestruct_itself_and_revert.json → eth/tracers/live/testdata/supply/selfdestruct_itself_and_revert.json vendored
View file

0
eth/tracers/live/tests/supply/withdrawals.json → eth/tracers/live/testdata/supply/withdrawals.json vendored
View file

14
eth/tracers/live/tests/supply_filler.go → eth/tracers/live/testdata/supply_filler.go vendored
View file

@ -21,6 +21,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"log/slog"
"math/big"
"os"
"path"
@ -137,7 +138,7 @@ func fillSupplyOmittedFields(path string) error {
if err := compareAsJSON(expected, out); err != nil {
return err
}
if err := writeArtifact(filepath.Join(path, "omitted_fields.json"), "omitted_fields_cancun", db, chain, expected, nil); err != nil {
if err := writeArtefact(filepath.Join(path, "omitted_fields.json"), "omitted_fields_cancun", db, chain, expected, nil); err != nil {
return err
}
return nil
@ -183,7 +184,7 @@ func fillSupplyGenesisAlloc(path string) error {
if err := compareAsJSON(expected, out); err != nil {
return err
}
if err := writeArtifact(filepath.Join(path, "genesis_alloc.json"), "genesis_alloc_grayGlacier", db, chain, expected, nil); err != nil {
if err := writeArtefact(filepath.Join(path, "genesis_alloc.json"), "genesis_alloc_grayGlacier", db, chain, expected, nil); err != nil {
return err
}
return nil
@ -255,7 +256,7 @@ func fillSupplyEip1559Burn(path string) error {
if err := compareAsJSON(expected, out); err != nil {
return err
}
if err := writeArtifact(filepath.Join(path, "eip1559_burn.json"), "eip1559_burn_grayGlacier", db, chain, expected, nil); err != nil {
if err := writeArtefact(filepath.Join(path, "eip1559_burn.json"), "eip1559_burn_grayGlacier", db, chain, expected, nil); err != nil {
return err
}
return nil
@ -302,7 +303,7 @@ func fillSupplyWithdrawals(path string) error {
if err := compareAsJSON(expected, out); err != nil {
return err
}
if err := writeArtifact(filepath.Join(path, "withdrawals.json"), "withdrawals_cancun", db, chain, expected, nil); err != nil {
if err := writeArtefact(filepath.Join(path, "withdrawals.json"), "withdrawals_cancun", db, chain, expected, nil); err != nil {
return err
}
return nil
@ -636,7 +637,7 @@ func fillSupplySelfdestructItselfAndRevert(path string) error {
if err := compareAsJSON(expected, output); err != nil {
return err
}
if err := writeArtifact(filepath.Join(path, "selfdestruct_itself_and_revert.json"), "selfdestruct_itself_and_revert_grayGlacier", db, chain, expected, nil); err != nil {
if err := writeArtefact(filepath.Join(path, "selfdestruct_itself_and_revert.json"), "selfdestruct_itself_and_revert_grayGlacier", db, chain, expected, nil); err != nil {
return err
}
return nil
@ -717,7 +718,7 @@ func compareAsJSON(expected interface{}, actual interface{}) error {
return nil
}
func writeArtifact(path, name string, db ethdb.Database, chain *core.BlockChain, expected []supplyInfo, post *types.GenesisAlloc) error {
func writeArtefact(path, name string, db ethdb.Database, chain *core.BlockChain, expected []supplyInfo, post *types.GenesisAlloc) error {
bt, err := btFromChain(db, chain, post)
if err != nil {
return fmt.Errorf("failed to fill tests from chain: %v", err)
@ -739,6 +740,7 @@ func writeBTs(path string, tests map[string]*blockTest) error {
if err := os.WriteFile(path, enc, 0644); err != nil {
return fmt.Errorf("failed to write test to file: %v", err)
}
slog.Info("Wrote artefact", "file", path)
return nil
}