X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=test%2Fbench_blockchain_test.go;h=092811d510c1b9a4fbeb54e1e8867efab7a5db61;hp=8ccb36b759d6eaad265d8a065783688f57a67c50;hb=refs%2Fheads%2Fblock_fetcher;hpb=e57f41f037f3f37fd7253e34f8a04e60a125e634

diff --git a/test/bench_blockchain_test.go b/test/bench_blockchain_test.go
index 8ccb36b7..092811d5 100644
--- a/test/bench_blockchain_test.go
+++ b/test/bench_blockchain_test.go
@@ -7,20 +7,18 @@ import (
 	"testing"
 	"time"
 
-	dbm "github.com/tendermint/tmlibs/db"
-
 	"github.com/vapor/account"
 	"github.com/vapor/blockchain/pseudohsm"
 	"github.com/vapor/blockchain/signers"
 	"github.com/vapor/blockchain/txbuilder"
 	"github.com/vapor/config"
 	"github.com/vapor/consensus"
-	engine "github.com/vapor/consensus/consensus"
-	"github.com/vapor/consensus/consensus/dpos"
 	"github.com/vapor/crypto/ed25519/chainkd"
-	"github.com/vapor/database/leveldb"
+	"github.com/vapor/database"
+	dbm "github.com/vapor/database/leveldb"
 	"github.com/vapor/database/storage"
-	"github.com/vapor/mining"
+	"github.com/vapor/event"
+	"github.com/vapor/proposal"
 	"github.com/vapor/protocol"
 	"github.com/vapor/protocol/bc"
 	"github.com/vapor/protocol/bc/types"
@@ -129,7 +127,7 @@ func GenerateChainData(dirPath string, testDB dbm.DB, txNumber, otherAssetNum in
 
 	// init UtxoViewpoint
 	utxoView := state.NewUtxoViewpoint()
-	utxoEntry := storage.NewUtxoEntry(false, 1, false)
+	utxoEntry := storage.NewUtxoEntry(storage.NormalUTXOType, 1, false)
 	for _, tx := range txs {
 		for _, id := range tx.SpentOutputIDs {
 			utxoView.Entries[id] = utxoEntry
@@ -139,15 +137,12 @@ func GenerateChainData(dirPath string, testDB dbm.DB, txNumber, otherAssetNum in
 	if err := SetUtxoView(testDB, utxoView); err != nil {
 		return nil, nil, nil, err
 	}
-	var engine engine.Engine
-	switch config.CommonConfig.Consensus.Type {
-	case "dpos":
-		engine = dpos.GDpos
-	}
 
-	store := leveldb.NewStore(testDB)
-	txPool := protocol.NewTxPool(store)
-	chain, err := protocol.NewChain(store, txPool, engine)
+	config.CommonConfig = config.DefaultConfig()
+	store := database.NewStore(testDB)
+	dispatcher := event.NewDispatcher()
+	txPool := protocol.NewTxPool(store, dispatcher)
+	chain, err := protocol.NewChain(store, txPool, dispatcher)
 	if err != nil {
 		return nil, nil, nil, err
 	}
@@ -164,7 +159,7 @@ func InsertChain(chain *protocol.Chain, txPool *protocol.TxPool, txs []*types.Tx
 		}
 	}
 
-	block, err := mining.NewBlockTemplate(chain, txPool, nil, nil, nil)
+	block, err := proposal.NewBlockTemplate(chain, txPool, nil, uint64(time.Now().UnixNano()/1e6))
 	if err != nil {
 		return err
 	}
@@ -189,11 +184,6 @@ func InsertChain(chain *protocol.Chain, txPool *protocol.TxPool, txs []*types.Tx
 }
 
 func processNewTxch(txPool *protocol.TxPool) {
-	newTxCh := txPool.GetMsgCh()
-	for tx := range newTxCh {
-		if tx == nil {
-		}
-	}
 }
 
 func MockSimpleUtxo(index uint64, assetID *bc.AssetID, amount uint64, ctrlProg *account.CtrlProgram) *account.UTXO {
@@ -261,7 +251,7 @@ func AddTxInputFromUtxo(utxo *account.UTXO, singer *signers.Signer) (*types.TxIn
 }
 
 func AddTxOutput(assetID bc.AssetID, amount uint64, controlProgram []byte) *types.TxOutput {
-	out := types.NewTxOutput(assetID, amount, controlProgram)
+	out := types.NewIntraChainOutput(assetID, amount, controlProgram)
 	return out
 }
 
@@ -369,7 +359,7 @@ func CreateTxbyNum(txNumber, otherAssetNum int) ([]*types.Tx, error) {
 
 func SetUtxoView(db dbm.DB, view *state.UtxoViewpoint) error {
 	batch := db.NewBatch()
-	if err := leveldb.SaveUtxoView(batch, view); err != nil {
+	if err := database.SaveUtxoView(batch, view); err != nil {
 		return err
 	}
 	batch.Write()
@@ -378,7 +368,8 @@ func SetUtxoView(db dbm.DB, view *state.UtxoViewpoint) error {
 
 //-------------------------Mock actual transaction----------------------------------
 func MockTxsP2PKH(keyDirPath string, testDB dbm.DB, txNumber, otherAssetNum int) ([]*types.Tx, error) {
-	accountManager := account.NewManager(testDB, nil)
+	accountStore := database.NewAccountStore(testDB)
+	accountManager := account.NewManager(accountStore, nil)
 	hsm, err := pseudohsm.New(keyDirPath)
 	if err != nil {
 		return nil, err
@@ -420,7 +411,8 @@ func MockTxsP2PKH(keyDirPath string, testDB dbm.DB, txNumber, otherAssetNum int)
 }
 
 func MockTxsP2SH(keyDirPath string, testDB dbm.DB, txNumber, otherAssetNum int) ([]*types.Tx, error) {
-	accountManager := account.NewManager(testDB, nil)
+	accountStore := database.NewAccountStore(testDB)
+	accountManager := account.NewManager(accountStore, nil)
 	hsm, err := pseudohsm.New(keyDirPath)
 	if err != nil {
 		return nil, err
@@ -467,7 +459,8 @@ func MockTxsP2SH(keyDirPath string, testDB dbm.DB, txNumber, otherAssetNum int)
 }
 
 func MockTxsMultiSign(keyDirPath string, testDB dbm.DB, txNumber, otherAssetNum int) ([]*types.Tx, error) {
-	accountManager := account.NewManager(testDB, nil)
+	accountStore := database.NewAccountStore(testDB)
+	accountManager := account.NewManager(accountStore, nil)
 	hsm, err := pseudohsm.New(keyDirPath)
 	if err != nil {
 		return nil, err