diff options
author | Jimmy Hu <jimmy.hu@dexon.org> | 2018-12-13 11:12:59 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@dexon.org> | 2018-12-19 20:54:27 +0800 |
commit | 310d8e5329cdccaef4a0add983b75cb5ca1751f9 (patch) | |
tree | 394fcbe428f05919214ed3801360b6cff635804f /dex/cache_test.go | |
parent | 0277eac4fdd78f87c5ec0cbd75e1f104cdf52b7d (diff) | |
download | dexon-310d8e5329cdccaef4a0add983b75cb5ca1751f9.tar dexon-310d8e5329cdccaef4a0add983b75cb5ca1751f9.tar.gz dexon-310d8e5329cdccaef4a0add983b75cb5ca1751f9.tar.bz2 dexon-310d8e5329cdccaef4a0add983b75cb5ca1751f9.tar.lz dexon-310d8e5329cdccaef4a0add983b75cb5ca1751f9.tar.xz dexon-310d8e5329cdccaef4a0add983b75cb5ca1751f9.tar.zst dexon-310d8e5329cdccaef4a0add983b75cb5ca1751f9.zip |
vendor: sync to latest core and fix conflict
Diffstat (limited to 'dex/cache_test.go')
-rw-r--r-- | dex/cache_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
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}) |