From 310d8e5329cdccaef4a0add983b75cb5ca1751f9 Mon Sep 17 00:00:00 2001
From: Jimmy Hu <jimmy.hu@dexon.org>
Date: Thu, 13 Dec 2018 11:12:59 +0800
Subject: vendor: sync to latest core and fix conflict
---
dex/blockdb/db.go | 41 +++++++++++++++++++++++++++++------------
1 file changed, 29 insertions(+), 12 deletions(-)
(limited to 'dex/blockdb')
diff --git a/dex/blockdb/db.go b/dex/blockdb/db.go
index 8282923fb..4f08a3edd 100644
--- a/dex/blockdb/db.go
+++ b/dex/blockdb/db.go
@@ -1,8 +1,25 @@
+// Copyright 2018 The dexon-consensus Authors
+// This file is part of the dexon-consensus library.
+//
+// The dexon-consensus library is free software: you can redistribute it
+// and/or modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation, either version 3 of the License,
+// or (at your option) any later version.
+//
+// The dexon-consensus library is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
+// General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the dexon-consensus library. If not, see
+// <http://www.gnu.org/licenses/>.
+
package blockdb
import (
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"
"github.com/dexon-foundation/dexon/common"
@@ -19,33 +36,33 @@ func NewDatabase(db ethdb.Database) *BlockDB {
return &BlockDB{db}
}
-func (d *BlockDB) Has(hash coreCommon.Hash) bool {
+func (d *BlockDB) HasBlock(hash coreCommon.Hash) bool {
return rawdb.HasCoreBlock(d.db, common.Hash(hash))
}
-func (d *BlockDB) Get(hash coreCommon.Hash) (coreTypes.Block, error) {
+func (d *BlockDB) GetBlock(hash coreCommon.Hash) (coreTypes.Block, error) {
block := rawdb.ReadCoreBlock(d.db, common.Hash(hash))
if block == nil {
- return coreTypes.Block{}, coreBlockdb.ErrBlockDoesNotExist
+ return coreTypes.Block{}, coreDb.ErrBlockDoesNotExist
}
return *block, nil
}
-func (d *BlockDB) GetAll() (coreBlockdb.BlockIterator, error) {
- return nil, coreBlockdb.ErrNotImplemented
+func (d *BlockDB) GetAllBlocks() (coreDb.BlockIterator, error) {
+ return nil, coreDb.ErrNotImplemented
}
-func (d *BlockDB) Update(block coreTypes.Block) error {
- if !d.Has(block.Hash) {
- return coreBlockdb.ErrBlockDoesNotExist
+func (d *BlockDB) UpdateBlock(block coreTypes.Block) error {
+ if !d.HasBlock(block.Hash) {
+ return coreDb.ErrBlockDoesNotExist
}
rawdb.WriteCoreBlock(d.db, common.Hash(block.Hash), &block)
return nil
}
-func (d *BlockDB) Put(block coreTypes.Block) error {
- if d.Has(block.Hash) {
- return coreBlockdb.ErrBlockExists
+func (d *BlockDB) PutBlock(block coreTypes.Block) error {
+ if d.HasBlock(block.Hash) {
+ return coreDb.ErrBlockExists
}
rawdb.WriteCoreBlock(d.db, common.Hash(block.Hash), &block)
return nil
--
cgit v1.2.3