From 3778e956013cad171cd5954686831e2598de3045 Mon Sep 17 00:00:00 2001
From: Mission Liao <mission.liao@dexon.org>
Date: Tue, 31 Jul 2018 18:46:24 +0800
Subject: blockdb: allow to dump blocks to json-encoded file

- Allow to dump blockdb to a json file
  - Compared to leveldb, a json file is easier to trace.
- Add interfaces block database:
  - Close would be required by database that needs cleanup.
  - BlockIterator is required when we need to access 'all' blocks,
     adding a new method 'GetAll' as the constructor for iterators.
- Remove GetByValidatorAndHeight from blockdb.Reader
  - This function is not used anywhere, to make interface
     minimum, remove it.
- Fix typo: backend -> backed
---
 blockdb/level-db_test.go | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'blockdb/level-db_test.go')

diff --git a/blockdb/level-db_test.go b/blockdb/level-db_test.go
index ef698f6..863adba 100644
--- a/blockdb/level-db_test.go
+++ b/blockdb/level-db_test.go
@@ -36,7 +36,7 @@ type LevelDBTestSuite struct {
 
 func (s *LevelDBTestSuite) TestBasicUsage() {
 	dbName := fmt.Sprintf("test-db-%v.db", time.Now().UTC())
-	db, err := NewLevelDBBackendBlockDB(dbName)
+	db, err := NewLevelDBBackedBlockDB(dbName)
 	s.Require().Nil(err)
 	defer func(dbName string) {
 		err = db.Close()
@@ -81,7 +81,7 @@ func (s *LevelDBTestSuite) TestBasicUsage() {
 	s.Nil(err)
 
 	// Try to get it back via ValidatorID and height.
-	queried, err = db.GetByValidatorAndHeight(block1.ProposerID, block1.Height)
+	queried, err = db.Get(block1.Hash)
 
 	s.Nil(err)
 	s.Equal(now, queried.Timestamps[queried.ProposerID])
@@ -89,7 +89,7 @@ func (s *LevelDBTestSuite) TestBasicUsage() {
 
 func (s *LevelDBTestSuite) TestSyncIndex() {
 	dbName := fmt.Sprintf("test-db-%v-si.db", time.Now().UTC())
-	db, err := NewLevelDBBackendBlockDB(dbName)
+	db, err := NewLevelDBBackedBlockDB(dbName)
 	s.Require().Nil(err)
 	defer func(dbName string) {
 		err = db.Close()
@@ -116,7 +116,7 @@ func (s *LevelDBTestSuite) TestSyncIndex() {
 	s.Nil(err)
 
 	// Load back blocks(syncIndex is called).
-	db, err = NewLevelDBBackendBlockDB(dbName)
+	db, err = NewLevelDBBackedBlockDB(dbName)
 	s.Require().Nil(err)
 
 	// Verify result.
@@ -126,13 +126,6 @@ func (s *LevelDBTestSuite) TestSyncIndex() {
 		s.Equal(block.ProposerID, queried.ProposerID)
 		s.Equal(block.Height, queried.Height)
 	}
-
-	// Verify result using GetByValidatorAndHeight().
-	for _, block := range blocks {
-		queried, err := db.GetByValidatorAndHeight(block.ProposerID, block.Height)
-		s.Nil(err)
-		s.Equal(block.Hash, queried.Hash)
-	}
 }
 
 func TestLevelDB(t *testing.T) {
-- 
cgit v1.2.3