X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=test%2Fwallet_test_util.go;h=a3c1e19b9a0293b780ef024bfe89af4ae231a6cd;hb=HEAD;hp=261c087a5fa171243cadb07239b3ac2d2fe6f7b0;hpb=a795c2c4f52973630972ba062716fb40b7016c46;p=bytom%2Fvapor.git

diff --git a/test/wallet_test_util.go b/test/wallet_test_util.go
index 261c087a..a3c1e19b 100644
--- a/test/wallet_test_util.go
+++ b/test/wallet_test_util.go
@@ -7,19 +7,17 @@ import (
 	"path"
 	"reflect"
 
-	dbm "github.com/tendermint/tmlibs/db"
-
-	"github.com/vapor/account"
-	"github.com/vapor/asset"
-	"github.com/vapor/blockchain/pseudohsm"
-	"github.com/vapor/blockchain/signers"
-	"github.com/vapor/common"
-	"github.com/vapor/config"
-	"github.com/vapor/consensus"
-	"github.com/vapor/crypto/ed25519/chainkd"
-	"github.com/vapor/protocol"
-	"github.com/vapor/protocol/bc/types"
-	w "github.com/vapor/wallet"
+	"github.com/bytom/vapor/account"
+	"github.com/bytom/vapor/asset"
+	"github.com/bytom/vapor/blockchain/pseudohsm"
+	"github.com/bytom/vapor/blockchain/signers"
+	"github.com/bytom/vapor/crypto/ed25519/chainkd"
+	"github.com/bytom/vapor/database"
+	dbm "github.com/bytom/vapor/database/leveldb"
+	"github.com/bytom/vapor/event"
+	"github.com/bytom/vapor/protocol"
+	"github.com/bytom/vapor/protocol/bc/types"
+	w "github.com/bytom/vapor/wallet"
 )
 
 type walletTestConfig struct {
@@ -88,14 +86,6 @@ func (t *wtTransaction) create(ctx *walletTestContext) (*types.Tx, error) {
 			if err := generator.AddSpendInput(input.AccountAlias, input.AssetAlias, input.Amount); err != nil {
 				return nil, err
 			}
-		case "issue":
-			_, err := ctx.createAsset(input.AccountAlias, input.AssetAlias)
-			if err != nil {
-				return nil, err
-			}
-			if err := generator.AddIssuanceInput(input.AssetAlias, input.Amount); err != nil {
-				return nil, err
-			}
 		}
 	}
 
@@ -151,14 +141,6 @@ func (ctx *walletTestContext) getPubkey(keyAlias string) *chainkd.XPub {
 	return nil
 }
 
-func (ctx *walletTestContext) createAsset(accountAlias string, assetAlias string) (*asset.Asset, error) {
-	acc, err := ctx.Wallet.AccountMgr.FindByAlias(accountAlias)
-	if err != nil {
-		return nil, err
-	}
-	return ctx.Wallet.AssetReg.Define(acc.XPubs, len(acc.XPubs), nil, assetAlias, nil)
-}
-
 func (ctx *walletTestContext) newBlock(txs []*types.Tx, coinbaseAccount string) (*types.Block, error) {
 	controlProgram, err := ctx.createControlProgram(coinbaseAccount, true)
 	if err != nil {
@@ -186,7 +168,7 @@ func (ctx *walletTestContext) createAccount(name string, keys []string, quorum i
 }
 
 func (ctx *walletTestContext) update(block *types.Block) error {
-	if err := SolveAndUpdate(ctx.Chain, block); err != nil {
+	if _, err := ctx.Chain.ProcessBlock(block); err != nil {
 		return err
 	}
 	if err := ctx.Wallet.AttachBlock(block); err != nil {
@@ -259,18 +241,21 @@ func (cfg *walletTestConfig) Run() error {
 	if err != nil {
 		return err
 	}
-	config.CommonConfig.Consensus.Dpos.Coinbase = "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep"
-	address, err := common.DecodeAddress(config.CommonConfig.Consensus.Dpos.Coinbase, &consensus.SoloNetParams)
-	if err != nil {
-		return err
-	}
 	walletDB := dbm.NewDB("wallet", "leveldb", path.Join(dirPath, "wallet_db"))
-	accountManager := account.NewManager(walletDB, chain)
+	walletStore := database.NewWalletStore(walletDB)
+	accountStore := database.NewAccountStore(walletDB)
+	accountManager := account.NewManager(accountStore, chain)
 	assets := asset.NewRegistry(walletDB, chain)
-	wallet, err := w.NewWallet(walletDB, accountManager, assets, hsm, chain, address)
+	dispatcher := event.NewDispatcher()
+	wallet, err := w.NewWallet(walletStore, accountManager, assets, hsm, chain, dispatcher, false)
 	if err != nil {
 		return err
 	}
+
+	if err = wallet.Run(); err != nil {
+		return err
+	}
+
 	ctx := &walletTestContext{
 		Wallet: wallet,
 		Chain:  chain,