big-bang: single chain (#446)

1 files changed, 2 insertions, 129 deletions

diff --git a/core/test/block-revealer_test.go b/core/test/block-revealer_test.go
index 0e56eea..54432e8 100644
--- a/core/test/block-revealer_test.go
+++ b/core/test/block-revealer_test.go
@@ -19,7 +19,6 @@ package test
 
 import (
 	"testing"
-	"time"
 
 	"github.com/dexon-foundation/dexon-consensus/common"
 	"github.com/dexon-foundation/dexon-consensus/core/db"
@@ -29,132 +28,6 @@ import (
 
 type BlockRevealerTestSuite struct {
 	suite.Suite
-
-	db              db.Database
-	totalBlockCount int
-}
-
-func (s *BlockRevealerTestSuite) SetupSuite() {
-	var (
-		err         error
-		genesisTime = time.Now().UTC()
-	)
-	// Setup block database.
-	s.db, err = db.NewMemBackedDB()
-	s.Require().NoError(err)
-
-	// Randomly generate blocks.
-	config := &BlocksGeneratorConfig{
-		NumChains:            19,
-		MinBlockTimeInterval: 250 * time.Millisecond,
-	}
-	gen := NewBlocksGenerator(config, nil)
-	s.Require().NoError(gen.Generate(
-		0,
-		genesisTime,
-		genesisTime.Add(30*time.Second),
-		s.db))
-	// Cache the count of total generated block.
-	iter, err := s.db.GetAllBlocks()
-	s.Require().NoError(err)
-	blocks, err := loadAllBlocks(iter)
-	s.Require().NoError(err)
-	s.totalBlockCount = len(blocks)
-}
-
-func (s *BlockRevealerTestSuite) baseTest(
-	revealer BlockRevealer,
-	repeat int,
-	checkFunc func(*types.Block, map[common.Hash]struct{})) {
-
-	revealingSequence := map[string]struct{}{}
-	for i := 0; i < repeat; i++ {
-		revealed := map[common.Hash]struct{}{}
-		sequence := ""
-		for {
-			b, err := revealer.NextBlock()
-			if err != nil {
-				if err == db.ErrIterationFinished {
-					err = nil
-					break
-				}
-				s.Require().NotNil(err)
-			}
-			checkFunc(&b, revealed)
-			revealed[b.Hash] = struct{}{}
-			sequence += b.Hash.String() + ","
-		}
-		s.Len(revealed, s.totalBlockCount)
-		revealingSequence[sequence] = struct{}{}
-		revealer.Reset()
-	}
-	// It should be reasonable to reveal at least two
-	// different sequence.
-	s.True(len(revealingSequence) > 1)
-
-}
-
-func (s *BlockRevealerTestSuite) TestRandomBlockReveal() {
-	// This test case would make sure we could at least generate
-	// two different revealing sequence when revealing more than
-	// 10 times.
-	iter, err := s.db.GetAllBlocks()
-	s.Require().Nil(err)
-	revealer, err := NewRandomBlockRevealer(iter)
-	s.Require().Nil(err)
-
-	checkFunc := func(b *types.Block, revealed map[common.Hash]struct{}) {
-		// Make sure the revealer won't reveal the same block twice.
-		_, alreadyRevealed := revealed[b.Hash]
-		s.False(alreadyRevealed)
-	}
-	s.baseTest(revealer, 10, checkFunc)
-}
-
-func (s *BlockRevealerTestSuite) TestRandomDAGBlockReveal() {
-	// This test case would make sure we could at least generate
-	// two different revealing sequence when revealing more than
-	// 10 times, and each of them would form valid DAGs during
-	// revealing.
-
-	iter, err := s.db.GetAllBlocks()
-	s.Require().Nil(err)
-	revealer, err := NewRandomDAGBlockRevealer(iter)
-	s.Require().Nil(err)
-
-	checkFunc := func(b *types.Block, revealed map[common.Hash]struct{}) {
-		// Make sure this revealer won't reveal
-		// the same block twice.
-		_, alreadyRevealed := revealed[b.Hash]
-		s.False(alreadyRevealed)
-		// Make sure the newly revealed block would still
-		// form a valid DAG after added to revealed blocks.
-		s.True(isAllAckingBlockRevealed(b, revealed))
-	}
-	s.baseTest(revealer, 10, checkFunc)
-}
-
-func (s *BlockRevealerTestSuite) TestRandomTipBlockReveal() {
-	// This test case would make sure we could at least generate
-	// two different revealing sequence when revealing more than
-	// 10 times.
-	iter, err := s.db.GetAllBlocks()
-	s.Require().Nil(err)
-	revealer, err := NewRandomTipBlockRevealer(iter)
-	s.Require().Nil(err)
-
-	checkFunc := func(b *types.Block, revealed map[common.Hash]struct{}) {
-		// Make sure the revealer won't reveal the same block twice.
-		_, alreadyRevealed := revealed[b.Hash]
-		s.False(alreadyRevealed)
-		// Make sure the parent is already revealed.
-		if b.Position.Height == 0 {
-			return
-		}
-		_, alreadyRevealed = revealed[b.ParentHash]
-		s.True(alreadyRevealed)
-	}
-	s.baseTest(revealer, 10, checkFunc)
 }
 
 func (s *BlockRevealerTestSuite) TestCompactionChainBlockReveal() {
@@ -186,7 +59,7 @@ func (s *BlockRevealerTestSuite) TestCompactionChainBlockReveal() {
 	// instance successfully.
 	r, err := NewCompactionChainBlockRevealer(iter, 0)
 	s.Require().Nil(r)
-	s.Require().IsType(ErrNotValidCompactionChain, err)
+	s.Require().Equal(ErrNotValidCompactionChain.Error(), err.Error())
 	// Put a block to make the compaction chain complete.
 	s.Require().NoError(dbInst.PutBlock(*b2))
 	// We can construct that revealer now.
@@ -206,7 +79,7 @@ func (s *BlockRevealerTestSuite) TestCompactionChainBlockReveal() {
 	chk(3)
 	// Iteration should be finished
 	_, err = r.NextBlock()
-	s.Require().IsType(db.ErrIterationFinished, err)
+	s.Require().Equal(db.ErrIterationFinished.Error(), err.Error())
 	// Test 'startHeight' parameter.
 	iter, err = dbInst.GetAllBlocks()
 	s.Require().NoError(err)