X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=test%2Fblock_test_util.go;h=2d7e0ff58e08b7c86b32b10b2e350c22e308b9c7;hp=21381c5a5cb4826f45a267ed4e6cc075fd05ad98;hb=1337be95f74a1d2a1a7316737efde413f29bcb2f;hpb=08281341c2cb02ba11d4218576256688854790fc

diff --git a/test/block_test_util.go b/test/block_test_util.go
index 21381c5a..2d7e0ff5 100644
--- a/test/block_test_util.go
+++ b/test/block_test_util.go
@@ -1,12 +1,11 @@
 package test
 
 import (
-	"github.com/vapor/mining/tensority"
-	"github.com/vapor/protocol"
-	"github.com/vapor/protocol/bc"
-	"github.com/vapor/protocol/bc/types"
-	"github.com/vapor/protocol/validation"
-	"github.com/vapor/protocol/vm"
+	"github.com/bytom/vapor/protocol"
+	"github.com/bytom/vapor/protocol/bc"
+	"github.com/bytom/vapor/protocol/bc/types"
+	"github.com/bytom/vapor/protocol/validation"
+	"github.com/bytom/vapor/protocol/vm"
 )
 
 // NewBlock create block according to the current status of chain
@@ -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{})
-}