diff --git a/chains/chaindata_test.go b/chains/chaindata_test.go index d83b164..b2b6564 100644 --- a/chains/chaindata_test.go +++ b/chains/chaindata_test.go @@ -47,7 +47,7 @@ func testReadChainData(t *testing.T, data *chaindata.Paths) { } func TestReadChainData(t *testing.T) { - for _, name := range []string{"small", "small2"} { + for _, name := range []string{"permerge1", "premerge2"} { t.Run(name, func(t *testing.T) { data, err := chaindata.GetFixture(name) if err != nil { diff --git a/chains/data/small/geth/000002.ldb b/chains/data/premerge1/geth/chaindata/000002.ldb similarity index 100% rename from chains/data/small/geth/000002.ldb rename to chains/data/premerge1/geth/chaindata/000002.ldb diff --git a/chains/data/small/geth/000004.ldb b/chains/data/premerge1/geth/chaindata/000004.ldb similarity index 100% rename from chains/data/small/geth/000004.ldb rename to chains/data/premerge1/geth/chaindata/000004.ldb diff --git a/chains/data/small/geth/ancient/bodies.0000.cdat b/chains/data/premerge1/geth/chaindata/ancient/bodies.0000.cdat similarity index 100% rename from chains/data/small/geth/ancient/bodies.0000.cdat rename to chains/data/premerge1/geth/chaindata/ancient/bodies.0000.cdat diff --git a/chains/data/small/geth/ancient/bodies.cidx b/chains/data/premerge1/geth/chaindata/ancient/bodies.cidx similarity index 100% rename from chains/data/small/geth/ancient/bodies.cidx rename to chains/data/premerge1/geth/chaindata/ancient/bodies.cidx diff --git a/chains/data/small/geth/ancient/bodies.meta b/chains/data/premerge1/geth/chaindata/ancient/bodies.meta similarity index 100% rename from chains/data/small/geth/ancient/bodies.meta rename to chains/data/premerge1/geth/chaindata/ancient/bodies.meta diff --git a/chains/data/small/geth/ancient/diffs.0000.rdat b/chains/data/premerge1/geth/chaindata/ancient/diffs.0000.rdat similarity index 100% rename from chains/data/small/geth/ancient/diffs.0000.rdat rename to chains/data/premerge1/geth/chaindata/ancient/diffs.0000.rdat diff --git a/chains/data/small/geth/ancient/diffs.meta b/chains/data/premerge1/geth/chaindata/ancient/diffs.meta similarity index 100% rename from chains/data/small/geth/ancient/diffs.meta rename to chains/data/premerge1/geth/chaindata/ancient/diffs.meta diff --git a/chains/data/small/geth/ancient/diffs.ridx b/chains/data/premerge1/geth/chaindata/ancient/diffs.ridx similarity index 100% rename from chains/data/small/geth/ancient/diffs.ridx rename to chains/data/premerge1/geth/chaindata/ancient/diffs.ridx diff --git a/chains/data/small/geth/ancient/hashes.0000.rdat b/chains/data/premerge1/geth/chaindata/ancient/hashes.0000.rdat similarity index 100% rename from chains/data/small/geth/ancient/hashes.0000.rdat rename to chains/data/premerge1/geth/chaindata/ancient/hashes.0000.rdat diff --git a/chains/data/small/geth/ancient/hashes.meta b/chains/data/premerge1/geth/chaindata/ancient/hashes.meta similarity index 100% rename from chains/data/small/geth/ancient/hashes.meta rename to chains/data/premerge1/geth/chaindata/ancient/hashes.meta diff --git a/chains/data/small/geth/ancient/hashes.ridx b/chains/data/premerge1/geth/chaindata/ancient/hashes.ridx similarity index 100% rename from chains/data/small/geth/ancient/hashes.ridx rename to chains/data/premerge1/geth/chaindata/ancient/hashes.ridx diff --git a/chains/data/small/geth/ancient/headers.0000.cdat b/chains/data/premerge1/geth/chaindata/ancient/headers.0000.cdat similarity index 100% rename from chains/data/small/geth/ancient/headers.0000.cdat rename to chains/data/premerge1/geth/chaindata/ancient/headers.0000.cdat diff --git a/chains/data/small/geth/ancient/headers.cidx b/chains/data/premerge1/geth/chaindata/ancient/headers.cidx similarity index 100% rename from chains/data/small/geth/ancient/headers.cidx rename to chains/data/premerge1/geth/chaindata/ancient/headers.cidx diff --git a/chains/data/small/geth/ancient/headers.meta b/chains/data/premerge1/geth/chaindata/ancient/headers.meta similarity index 100% rename from chains/data/small/geth/ancient/headers.meta rename to chains/data/premerge1/geth/chaindata/ancient/headers.meta diff --git a/chains/data/small/geth/ancient/receipts.0000.cdat b/chains/data/premerge1/geth/chaindata/ancient/receipts.0000.cdat similarity index 100% rename from chains/data/small/geth/ancient/receipts.0000.cdat rename to chains/data/premerge1/geth/chaindata/ancient/receipts.0000.cdat diff --git a/chains/data/small/geth/ancient/receipts.cidx b/chains/data/premerge1/geth/chaindata/ancient/receipts.cidx similarity index 100% rename from chains/data/small/geth/ancient/receipts.cidx rename to chains/data/premerge1/geth/chaindata/ancient/receipts.cidx diff --git a/chains/data/small/geth/ancient/receipts.meta b/chains/data/premerge1/geth/chaindata/ancient/receipts.meta similarity index 100% rename from chains/data/small/geth/ancient/receipts.meta rename to chains/data/premerge1/geth/chaindata/ancient/receipts.meta diff --git a/chains/data/small2/geth/000002.ldb b/chains/data/premerge2/geth/chaindata/000002.ldb similarity index 100% rename from chains/data/small2/geth/000002.ldb rename to chains/data/premerge2/geth/chaindata/000002.ldb diff --git a/chains/data/small2/geth/000003.ldb b/chains/data/premerge2/geth/chaindata/000003.ldb similarity index 100% rename from chains/data/small2/geth/000003.ldb rename to chains/data/premerge2/geth/chaindata/000003.ldb diff --git a/chains/data/small2/geth/ancient/chain/bodies.0000.cdat b/chains/data/premerge2/geth/chaindata/ancient/chain/bodies.0000.cdat similarity index 100% rename from chains/data/small2/geth/ancient/chain/bodies.0000.cdat rename to chains/data/premerge2/geth/chaindata/ancient/chain/bodies.0000.cdat diff --git a/chains/data/small2/geth/ancient/chain/bodies.cidx b/chains/data/premerge2/geth/chaindata/ancient/chain/bodies.cidx similarity index 100% rename from chains/data/small2/geth/ancient/chain/bodies.cidx rename to chains/data/premerge2/geth/chaindata/ancient/chain/bodies.cidx diff --git a/chains/data/small2/geth/ancient/chain/bodies.meta b/chains/data/premerge2/geth/chaindata/ancient/chain/bodies.meta similarity index 100% rename from chains/data/small2/geth/ancient/chain/bodies.meta rename to chains/data/premerge2/geth/chaindata/ancient/chain/bodies.meta diff --git a/chains/data/small2/geth/ancient/chain/diffs.0000.rdat b/chains/data/premerge2/geth/chaindata/ancient/chain/diffs.0000.rdat similarity index 100% rename from chains/data/small2/geth/ancient/chain/diffs.0000.rdat rename to chains/data/premerge2/geth/chaindata/ancient/chain/diffs.0000.rdat diff --git a/chains/data/small2/geth/ancient/chain/diffs.meta b/chains/data/premerge2/geth/chaindata/ancient/chain/diffs.meta similarity index 100% rename from chains/data/small2/geth/ancient/chain/diffs.meta rename to chains/data/premerge2/geth/chaindata/ancient/chain/diffs.meta diff --git a/chains/data/small2/geth/ancient/chain/diffs.ridx b/chains/data/premerge2/geth/chaindata/ancient/chain/diffs.ridx similarity index 100% rename from chains/data/small2/geth/ancient/chain/diffs.ridx rename to chains/data/premerge2/geth/chaindata/ancient/chain/diffs.ridx diff --git a/chains/data/small2/geth/ancient/chain/hashes.0000.rdat b/chains/data/premerge2/geth/chaindata/ancient/chain/hashes.0000.rdat similarity index 100% rename from chains/data/small2/geth/ancient/chain/hashes.0000.rdat rename to chains/data/premerge2/geth/chaindata/ancient/chain/hashes.0000.rdat diff --git a/chains/data/small2/geth/ancient/chain/hashes.meta b/chains/data/premerge2/geth/chaindata/ancient/chain/hashes.meta similarity index 100% rename from chains/data/small2/geth/ancient/chain/hashes.meta rename to chains/data/premerge2/geth/chaindata/ancient/chain/hashes.meta diff --git a/chains/data/small2/geth/ancient/chain/hashes.ridx b/chains/data/premerge2/geth/chaindata/ancient/chain/hashes.ridx similarity index 100% rename from chains/data/small2/geth/ancient/chain/hashes.ridx rename to chains/data/premerge2/geth/chaindata/ancient/chain/hashes.ridx diff --git a/chains/data/small2/geth/ancient/chain/headers.0000.cdat b/chains/data/premerge2/geth/chaindata/ancient/chain/headers.0000.cdat similarity index 100% rename from chains/data/small2/geth/ancient/chain/headers.0000.cdat rename to chains/data/premerge2/geth/chaindata/ancient/chain/headers.0000.cdat diff --git a/chains/data/small2/geth/ancient/chain/headers.cidx b/chains/data/premerge2/geth/chaindata/ancient/chain/headers.cidx similarity index 100% rename from chains/data/small2/geth/ancient/chain/headers.cidx rename to chains/data/premerge2/geth/chaindata/ancient/chain/headers.cidx diff --git a/chains/data/small2/geth/ancient/chain/headers.meta b/chains/data/premerge2/geth/chaindata/ancient/chain/headers.meta similarity index 100% rename from chains/data/small2/geth/ancient/chain/headers.meta rename to chains/data/premerge2/geth/chaindata/ancient/chain/headers.meta diff --git a/chains/data/small2/geth/ancient/chain/receipts.0000.cdat b/chains/data/premerge2/geth/chaindata/ancient/chain/receipts.0000.cdat similarity index 100% rename from chains/data/small2/geth/ancient/chain/receipts.0000.cdat rename to chains/data/premerge2/geth/chaindata/ancient/chain/receipts.0000.cdat diff --git a/chains/data/small2/geth/ancient/chain/receipts.cidx b/chains/data/premerge2/geth/chaindata/ancient/chain/receipts.cidx similarity index 100% rename from chains/data/small2/geth/ancient/chain/receipts.cidx rename to chains/data/premerge2/geth/chaindata/ancient/chain/receipts.cidx diff --git a/chains/data/small2/geth/ancient/chain/receipts.meta b/chains/data/premerge2/geth/chaindata/ancient/chain/receipts.meta similarity index 100% rename from chains/data/small2/geth/ancient/chain/receipts.meta rename to chains/data/premerge2/geth/chaindata/ancient/chain/receipts.meta diff --git a/chains/small/chain.go b/chains/premerge1/chain.go similarity index 62% rename from chains/small/chain.go rename to chains/premerge1/chain.go index ed8670e..5e11d9a 100644 --- a/chains/small/chain.go +++ b/chains/premerge1/chain.go @@ -1,11 +1,11 @@ -package small +package premerge1 import ( "github.com/cerc-io/eth-testing/chains" ) var ( - ChainData, err = chaindata.GetFixture("small") + ChainData, err = chains.GetFixture("premerge1") ) func init() { diff --git a/chains/small2/chain.go b/chains/premerge2/chain.go similarity index 86% rename from chains/small2/chain.go rename to chains/premerge2/chain.go index b63d39d..cdbd7ae 100644 --- a/chains/small2/chain.go +++ b/chains/premerge2/chain.go @@ -1,4 +1,4 @@ -package small2 +package premerge2 import ( "github.com/cerc-io/eth-testing/chains" @@ -6,7 +6,7 @@ import ( ) var ( - ChainData, err = chaindata.GetFixture("small2") + ChainData, err = chains.GetFixture("premerge2") // keybytes-encoded leaf keys of all state nodes Block1_StateNodeLeafKeys [][]byte diff --git a/chains/small2/paths.go b/chains/premerge2/paths.go similarity index 99% rename from chains/small2/paths.go rename to chains/premerge2/paths.go index 42b2f77..3f17384 100644 --- a/chains/small2/paths.go +++ b/chains/premerge2/paths.go @@ -1,4 +1,4 @@ -package small2 +package premerge2 var Block1_StateNodePaths = [][]byte{ {},