cerc-io/eth-statediff-compliance
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move fixture module to reexports

Browse Source
This commit is contained in:
Roy Crihfield 2024-07-09 19:20:14 +08:00
parent efa2b5cdc5
commit e23243d59d
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/statediff/reexport_geth.go
View File

@ -5,8 +5,11 @@ package statediff
import ( import (
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/cerc-io/eth-testing/chaindata/mainnet"
"github.com/ethereum/go-ethereum/statediff" "github.com/ethereum/go-ethereum/statediff"
sdtypes "github.com/ethereum/go-ethereum/statediff/types" sdtypes "github.com/ethereum/go-ethereum/statediff/types"
) )
@ -27,3 +30,7 @@ func CommitDefaultGenesis(db ethdb.Database) {
func init() { func init() {
log.Root().SetHandler(log.DiscardHandler()) log.Root().SetHandler(log.DiscardHandler())
} }
func GetMainnetBlocks() []*types.Block {
return mainnet.GetBlocks()
}

6
internal/statediff/reexport_plugin.go
View File

@ -5,9 +5,11 @@ package statediff
import ( import (
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/triedb" "github.com/ethereum/go-ethereum/triedb"
"github.com/cerc-io/eth-testing/chains/mainnet"
statediff "github.com/cerc-io/plugeth-statediff" statediff "github.com/cerc-io/plugeth-statediff"
"github.com/cerc-io/plugeth-statediff/adapt" "github.com/cerc-io/plugeth-statediff/adapt"
"github.com/cerc-io/plugeth-statediff/test_helpers" "github.com/cerc-io/plugeth-statediff/test_helpers"
@ -27,6 +29,10 @@ func CommitDefaultGenesis(db ethdb.Database) {
core.DefaultGenesisBlock().MustCommit(db, triedb.NewDatabase(db, nil)) core.DefaultGenesisBlock().MustCommit(db, triedb.NewDatabase(db, nil))
} }
func GetMainnetBlocks() []*types.Block {
return mainnet.GetBlocks()
}
func init() { func init() {
test_helpers.QuietLogs() test_helpers.QuietLogs()
} }

6
internal/statediff/reexport_plugin_parallel.go
View File

@ -5,9 +5,11 @@ package statediff
import ( import (
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/triedb" "github.com/ethereum/go-ethereum/triedb"
"github.com/cerc-io/eth-testing/chains/mainnet"
statediff "github.com/cerc-io/plugeth-statediff" statediff "github.com/cerc-io/plugeth-statediff"
"github.com/cerc-io/plugeth-statediff/adapt" "github.com/cerc-io/plugeth-statediff/adapt"
"github.com/cerc-io/plugeth-statediff/test_helpers" "github.com/cerc-io/plugeth-statediff/test_helpers"
@ -32,3 +34,7 @@ func CommitDefaultGenesis(db ethdb.Database) {
func init() { func init() {
test_helpers.QuietLogs() test_helpers.QuietLogs()
} }
func GetMainnetBlocks() []*types.Block {
return mainnet.GetBlocks()
}

3
pkg/diff_dump.go
View File

@ -14,7 +14,6 @@ import (
"github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/core/vm"
"github.com/cerc-io/eth-statediff-compliance/internal/statediff" "github.com/cerc-io/eth-statediff-compliance/internal/statediff"
"github.com/cerc-io/eth-testing/chains/mainnet"
) )
var ( var (
@ -25,7 +24,7 @@ var (
func loadChain() { func loadChain() {
db := rawdb.NewMemoryDatabase() db := rawdb.NewMemoryDatabase()
statediff.CommitDefaultGenesis(db) statediff.CommitDefaultGenesis(db)
blocks = mainnet.GetBlocks() blocks = statediff.GetMainnetBlocks()
chain, _ = core.NewBlockChain(db, nil, nil, nil, ethash.NewFaker(), vm.Config{}, nil, nil) chain, _ = core.NewBlockChain(db, nil, nil, nil, ethash.NewFaker(), vm.Config{}, nil, nil)
_, err := chain.InsertChain(blocks[1:]) _, err := chain.InsertChain(blocks[1:])
if err != nil { if err != nil {