From bde4a6cc02c6806093d2a49a86463f81358ca3d8 Mon Sep 17 00:00:00 2001 From: Jimmy Hu Date: Mon, 1 Apr 2019 18:01:26 +0800 Subject: vendor: sync to latest core (#320) * vendor: sync to latest core * dex, core: fix conflict x --- vendor/github.com/dexon-foundation/dexon-consensus/core/db/level-db.go | 2 -- 1 file changed, 2 deletions(-) (limited to 'vendor/github.com/dexon-foundation/dexon-consensus/core/db') diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/db/level-db.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/db/level-db.go index 88f5801fc..52968331e 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/db/level-db.go +++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/db/level-db.go @@ -362,7 +362,6 @@ func (lvl *LevelDBBackedDB) Close() error { func (lvl *LevelDBBackedDB) HasBlock(hash common.Hash) bool { exists, err := lvl.internalHasBlock(lvl.getBlockKey(hash)) if err != nil { - // TODO(missionliao): Modify the interface to return error. panic(err) } return exists @@ -429,7 +428,6 @@ func (lvl *LevelDBBackedDB) PutBlock(block types.Block) (err error) { // GetAllBlocks implements Reader.GetAllBlocks method, which allows callers // to retrieve all blocks in DB. func (lvl *LevelDBBackedDB) GetAllBlocks() (BlockIterator, error) { - // TODO (mission): Implement this part via goleveldb's iterator. return nil, ErrNotImplemented } -- cgit v1.2.3