forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor dev genesis (#10)

Browse source
This commit is contained in:
Dror Tirosh 2024-06-25 10:54:13 +03:00 committed by GitHub
parent 99b5f3c08f
commit 12089354ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/rip7560/rip7560TestUtils.go
View file

@ -9,7 +9,6 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/internal/ethapi"
"github.com/ethereum/go-ethereum/params"
"github.com/status-im/keycard-go/hexutils"
"math/big"
"testing"
@ -21,7 +20,6 @@ type testContext struct {
genesisAlloc types.GenesisAlloc
t *testing.T
chainContext *ethapi.ChainContext
chainConfig *params.ChainConfig
gaspool *core.GasPool
genesis *core.Genesis
genesisBlock *types.Block
@ -33,29 +31,20 @@ func newTestContext(t *testing.T) *testContext {
type testContextBuilder struct {
t *testing.T
chainConfig *params.ChainConfig
genesisAlloc types.GenesisAlloc
}
func newTestContextBuilder(t *testing.T) *testContextBuilder {
genesisAlloc := types.GenesisAlloc{}
chainConfig := params.AllDevChainProtocolChanges
// probably bug in geth..
chainConfig.PragueTime = chainConfig.CancunTime
return &testContextBuilder{
t: t,
chainConfig: chainConfig,
genesisAlloc: genesisAlloc,
}
}
func (tb *testContextBuilder) build() *testContext {
genesis := &core.Genesis{
Config: params.AllDevChainProtocolChanges,
Alloc: tb.genesisAlloc,
}
genesis := core.DeveloperGenesisBlock(10_000_000, &common.Address{})
genesisBlock := genesis.ToBlock()
gaspool := new(core.GasPool).AddGas(genesisBlock.GasLimit())
@ -66,7 +55,6 @@ func (tb *testContextBuilder) build() *testContext {
t: tb.t,
genesisAlloc: tb.genesisAlloc,
chainContext: ethapi.NewChainContext(context.TODO(), backend),
chainConfig: tb.chainConfig,
genesis: genesis,
genesisBlock: genesisBlock,
gaspool: gaspool,

2
tests/rip7560/validation_test.go
View file

@ -69,7 +69,7 @@ func validatePhase(tb *testContextBuilder, aatx types.Rip7560AccountAbstractionT
var state = tests.MakePreState(rawdb.NewMemoryDatabase(), t.genesisAlloc, false, rawdb.HashScheme)
defer state.Close()
_, err := core.ApplyRip7560ValidationPhases(t.chainConfig, t.chainContext, &common.Address{}, t.gaspool, state.StateDB, t.genesisBlock.Header(), tx, vm.Config{})
_, err := core.ApplyRip7560ValidationPhases(t.genesis.Config, t.chainContext, &common.Address{}, t.gaspool, state.StateDB, t.genesisBlock.Header(), tx, vm.Config{})
// err string or empty if nil
errStr := ""
if err != nil {