Skip to content

Commit 4f71350

Browse files
holimanjorgemmsilva
authored andcommitted
cmd/utils: fix merge-breakage in test (ethereum#28985)
1 parent cb35829 commit 4f71350

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

cmd/utils/history_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
"github.com/ethereum/go-ethereum/internal/era"
3737
"github.com/ethereum/go-ethereum/params"
3838
"github.com/ethereum/go-ethereum/trie"
39+
"github.com/ethereum/go-ethereum/triedb"
3940
)
4041

4142
var (
@@ -170,7 +171,7 @@ func TestHistoryImportAndExport(t *testing.T) {
170171
db2.Close()
171172
})
172173

173-
genesis.MustCommit(db2, trie.NewDatabase(db, trie.HashDefaults))
174+
genesis.MustCommit(db2, triedb.NewDatabase(db, triedb.HashDefaults))
174175
imported, err := core.NewBlockChain(db2, nil, genesis, nil, ethash.NewFaker(), vm.Config{}, nil, nil)
175176
if err != nil {
176177
t.Fatalf("unable to initialize chain: %v", err)

0 commit comments

Comments
 (0)