init delete the pow related (#55)

[bytom/vapor.git] / test / block_test_util.go

diff --git a/test/block_test_util.go b/test/block_test_util.go
index 21381c5..890d680 100644 (file)
--- a/test/block_test_util.go
+++ b/test/block_test_util.go
@@ -1,7 +1,6 @@
 package test
 
 import (
-       "github.com/vapor/mining/tensority"
        "github.com/vapor/protocol"
        "github.com/vapor/protocol/bc"
        "github.com/vapor/protocol/bc/types"
@@ -20,12 +19,6 @@ func NewBlock(chain *protocol.Chain, txs []*types.Tx, controlProgram []byte) (*t
        }
 
        preBlockHeader := chain.BestBlockHeader()
-       preBlockHash := preBlockHeader.Hash()
-       nextBits, err := chain.CalcNextBits(&preBlockHash)
-       if err != nil {
-               return nil, err
-       }
-
        b := &types.Block{
                BlockHeader: types.BlockHeader{
                        Version:           1,
@@ -33,7 +26,6 @@ func NewBlock(chain *protocol.Chain, txs []*types.Tx, controlProgram []byte) (*t
                        PreviousBlockHash: preBlockHeader.Hash(),
                        Timestamp:         preBlockHeader.Timestamp + 1,
                        BlockCommitment:   types.BlockCommitment{},
-                       Bits:              nextBits,
                },
                Transactions: []*types.Tx{nil},
        }
@@ -91,26 +83,9 @@ func AppendBlocks(chain *protocol.Chain, num uint64) error {
                if err != nil {
                        return err
                }
-               if err := SolveAndUpdate(chain, block); err != nil {
+               if _, err := chain.ProcessBlock(block); err != nil {
                        return err
                }
        }
        return nil
 }
-
-// SolveAndUpdate solve difficulty and update chain status
-func SolveAndUpdate(chain *protocol.Chain, block *types.Block) error {
-       seed, err := chain.CalcNextSeed(&block.PreviousBlockHash)
-       if err != nil {
-               return err
-       }
-       Solve(seed, block)
-       _, err = chain.ProcessBlock(block)
-       return err
-}
-
-// Solve simulate solve difficulty by add result to cache
-func Solve(seed *bc.Hash, block *types.Block) {
-       hash := block.BlockHeader.Hash()
-       tensority.AIHash.AddCache(&hash, seed, &bc.Hash{})
-}