X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=wallet%2Fwallet_test.go;h=c9f8b4a17f18bb9fd2faee081f59772d3d7ee088;hp=519a6b7a7eb980e5d33c1ec709e91086076a1700;hb=e57f41f037f3f37fd7253e34f8a04e60a125e634;hpb=620deabb3a00c7995b190b5ed47a224826165ecf

diff --git a/wallet/wallet_test.go b/wallet/wallet_test.go
index 519a6b7a..c9f8b4a1 100644
--- a/wallet/wallet_test.go
+++ b/wallet/wallet_test.go
@@ -7,15 +7,16 @@ import (
 	"time"
 
 	dbm "github.com/tendermint/tmlibs/db"
-	"github.com/vapor/blockchain/signers"
-	"github.com/vapor/common"
-	"github.com/vapor/config"
-
 	"github.com/vapor/account"
 	"github.com/vapor/asset"
 	"github.com/vapor/blockchain/pseudohsm"
+	"github.com/vapor/blockchain/signers"
 	"github.com/vapor/blockchain/txbuilder"
+	"github.com/vapor/common"
+	"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/protocol"
@@ -26,17 +27,17 @@ import (
 func TestWalletUpdate(t *testing.T) {
 	config.CommonConfig = config.DefaultConfig()
 	consensus.SoloNetParams.Signer = "78673764e0ba91a4c5ba9ec0c8c23c69e3d73bf27970e05e0a977e81e13bde475264d3b177a96646bc0ce517ae7fd63504c183ab6d330dea184331a4cf5912d5"
-	config.CommonConfig.Consensus.Dpos.SelfVoteSigners = append(config.CommonConfig.Consensus.Dpos.SelfVoteSigners, "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep")
-	config.CommonConfig.Consensus.Dpos.XPrv = "a8e281b615809046698fb0b0f2804a36d824d48fa443350f10f1b80649d39e5f1e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445"
-	for _, v := range config.CommonConfig.Consensus.Dpos.SelfVoteSigners {
+	config.CommonConfig.Consensus.SelfVoteSigners = append(config.CommonConfig.Consensus.SelfVoteSigners, "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep")
+	config.CommonConfig.Consensus.XPrv = "a8e281b615809046698fb0b0f2804a36d824d48fa443350f10f1b80649d39e5f1e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445"
+	for _, v := range config.CommonConfig.Consensus.SelfVoteSigners {
 		address, err := common.DecodeAddress(v, &consensus.SoloNetParams)
 		if err != nil {
 			t.Fatal(err)
 		}
-		config.CommonConfig.Consensus.Dpos.Signers = append(config.CommonConfig.Consensus.Dpos.Signers, address)
+		config.CommonConfig.Consensus.Signers = append(config.CommonConfig.Consensus.Signers, address)
 	}
-	config.CommonConfig.Consensus.Dpos.Coinbase = "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep"
-	address, err := common.DecodeAddress(config.CommonConfig.Consensus.Dpos.Coinbase, &consensus.SoloNetParams)
+	config.CommonConfig.Consensus.Coinbase = "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep"
+	address, err := common.DecodeAddress(config.CommonConfig.Consensus.Coinbase, &consensus.SoloNetParams)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -53,7 +54,12 @@ func TestWalletUpdate(t *testing.T) {
 	store := leveldb.NewStore(testDB)
 	txPool := protocol.NewTxPool(store)
 
-	chain, err := protocol.NewChain(store, txPool)
+	var engine engine.Engine
+	switch config.CommonConfig.Consensus.Type {
+	case "dpos":
+		engine = dpos.GDpos
+	}
+	chain, err := protocol.NewChain(store, txPool, engine)
 	if err != nil {
 		t.Fatal(err)
 	}