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.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dex/cache.go') diff --git a/dex/cache.go b/dex/cache.go index c95038e1d..89bbbe3be 100644 --- a/dex/cache.go +++ b/dex/cache.go @@ -21,7 +21,7 @@ import ( "sync" 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" ) @@ -48,12 +48,12 @@ type cache struct { blockCache map[coreCommon.Hash]*coreTypes.Block voteCache map[coreTypes.Position]map[voteKey]*coreTypes.Vote votePosition []coreTypes.Position - db coreBlockdb.BlockDatabase + db coreDb.Database voteSize int size int } -func newCache(size int, db coreBlockdb.BlockDatabase) *cache { +func newCache(size int, db coreDb.Database) *cache { return &cache{ blockCache: make(map[coreCommon.Hash]*coreTypes.Block), voteCache: make(map[coreTypes.Position]map[voteKey]*coreTypes.Vote), @@ -115,7 +115,7 @@ func (c *cache) blocks(hashes coreCommon.Hashes) []*coreTypes.Block { if block, exist := c.blockCache[hash]; exist { cacheBlocks = append(cacheBlocks, block) } else { - block, err := c.db.Get(hash) + block, err := c.db.GetBlock(hash) if err != nil { continue } -- cgit v1.2.3