From f25fcd34e11061568c187c44dd02fb6e9c8546de Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Fri, 6 Sep 2024 09:43:55 +0200 Subject: [PATCH] internal/ethapi: fix merge-conflicts --- internal/ethapi/api_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go index 5648e06287..f2dd93e4ac 100644 --- a/internal/ethapi/api_test.go +++ b/internal/ethapi/api_test.go @@ -24,6 +24,7 @@ import ( "encoding/json" "errors" "fmt" + "maps" "math/big" "os" "path/filepath" @@ -33,10 +34,6 @@ import ( "testing" "time" - "github.com/holiman/uint256" - "github.com/stretchr/testify/require" - "golang.org/x/exp/maps" - "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/accounts/keystore" @@ -58,6 +55,9 @@ import ( "github.com/ethereum/go-ethereum/internal/blocktest" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rpc" + "github.com/ethereum/go-ethereum/triedb" + "github.com/holiman/uint256" + "github.com/stretchr/testify/require" ) func testTransactionMarshal(t *testing.T, tests []txData, config *params.ChainConfig) { @@ -3291,8 +3291,8 @@ func (p *precompileContract) RequiredGas(input []byte) uint64 { return 0 } func (p *precompileContract) Run(input []byte) ([]byte, error) { return nil, nil } func TestStateOverrideMovePrecompile(t *testing.T) { - db := state.NewDatabase(rawdb.NewMemoryDatabase()) - statedb, err := state.New(common.Hash{}, db, nil) + db := state.NewDatabase(triedb.NewDatabase(rawdb.NewMemoryDatabase(), nil), nil) + statedb, err := state.New(common.Hash{}, db) if err != nil { t.Fatalf("failed to create statedb: %v", err) }