From aa34cc1069a815ed66ec8fae0988fc4f29687bfd 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/blockdb/db.go | 41 +++++++++++++++++++++++++++++------------ dex/cache.go | 8 ++++---- dex/cache_test.go | 8 ++++---- 3 files changed, 37 insertions(+), 20 deletions(-) (limited to 'dex') 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 +// . + 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 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 } 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