From ac95218229e1028b8024953d420f394eb08649e5 Mon Sep 17 00:00:00 2001 From: Jimmy Hu Date: Thu, 13 Dec 2018 11:12:59 +0800 Subject: vendor: sync to latest core and fix conflict --- dex/cache_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dex/cache_test.go') diff --git a/dex/cache_test.go b/dex/cache_test.go index 8a0066c94..3b43e77aa 100644 --- a/dex/cache_test.go +++ b/dex/cache_test.go @@ -23,7 +23,7 @@ import ( "testing" coreCommon "github.com/dexon-foundation/dexon-consensus/common" - coreBlockdb "github.com/dexon-foundation/dexon-consensus/core/blockdb" + coreDb "github.com/dexon-foundation/dexon-consensus/core/db" coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" ) @@ -42,7 +42,7 @@ func (v byHash) Swap(i int, j int) { } func TestCacheVote(t *testing.T) { - db, err := coreBlockdb.NewMemBackedBlockDB() + db, err := coreDb.NewMemBackedDB() if err != nil { panic(err) } @@ -131,7 +131,7 @@ func TestCacheVote(t *testing.T) { } func TestCacheBlock(t *testing.T) { - db, err := coreBlockdb.NewMemBackedBlockDB() + db, err := coreDb.NewMemBackedDB() if err != nil { panic(err) } @@ -191,7 +191,7 @@ func TestCacheBlock(t *testing.T) { block5 := &coreTypes.Block{ Hash: coreCommon.NewRandomHash(), } - if err := db.Put(*block5); err != nil { + if err := db.PutBlock(*block5); err != nil { panic(err) } blocks = cache.blocks(coreCommon.Hashes{block5.Hash}) -- cgit v1.2.3