cmd/utils: fix merge-breakage in test (#28985)
This commit is contained in:
parent
fe91d476ba
commit
55a46c3b10
@ -36,6 +36,7 @@ import (
|
|||||||
"github.com/ethereum/go-ethereum/internal/era"
|
"github.com/ethereum/go-ethereum/internal/era"
|
||||||
"github.com/ethereum/go-ethereum/params"
|
"github.com/ethereum/go-ethereum/params"
|
||||||
"github.com/ethereum/go-ethereum/trie"
|
"github.com/ethereum/go-ethereum/trie"
|
||||||
|
"github.com/ethereum/go-ethereum/triedb"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -170,7 +171,7 @@ func TestHistoryImportAndExport(t *testing.T) {
|
|||||||
db2.Close()
|
db2.Close()
|
||||||
})
|
})
|
||||||
|
|
||||||
genesis.MustCommit(db2, trie.NewDatabase(db, trie.HashDefaults))
|
genesis.MustCommit(db2, triedb.NewDatabase(db, triedb.HashDefaults))
|
||||||
imported, err := core.NewBlockChain(db2, nil, genesis, nil, ethash.NewFaker(), vm.Config{}, nil, nil)
|
imported, err := core.NewBlockChain(db2, nil, genesis, nil, ethash.NewFaker(), vm.Config{}, nil, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("unable to initialize chain: %v", err)
|
t.Fatalf("unable to initialize chain: %v", err)
|
||||||
|
Loading…
Reference in New Issue
Block a user