Mov (#518)

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

diff --git a/test/wallet_test_util.go b/test/wallet_test_util.go
index 9a2a0cc..a3c1e19 100644 (file)
--- a/test/wallet_test_util.go
+++ b/test/wallet_test_util.go
@@ -7,16 +7,17 @@ import (
        "path"
        "reflect"
 
-       "github.com/vapor/account"
-       "github.com/vapor/asset"
-       "github.com/vapor/blockchain/pseudohsm"
-       "github.com/vapor/blockchain/signers"
-       "github.com/vapor/crypto/ed25519/chainkd"
-       dbm "github.com/vapor/database/leveldb"
-       "github.com/vapor/event"
-       "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 {
@@ -85,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
-                       }
                }
        }
 
@@ -148,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, 0, assetAlias, nil)
-}
-
 func (ctx *walletTestContext) newBlock(txs []*types.Tx, coinbaseAccount string) (*types.Block, error) {
        controlProgram, err := ctx.createControlProgram(coinbaseAccount, true)
        if err != nil {
@@ -257,13 +242,20 @@ func (cfg *walletTestConfig) Run() error {
                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)
        dispatcher := event.NewDispatcher()
-       wallet, err := w.NewWallet(walletDB, accountManager, assets, hsm, chain, dispatcher, false)
+       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,