fix testdata

diff --git a/node/node.go b/node/node.go
index 7e0e8a2..8469de7 100644 (file)
--- a/node/node.go
+++ b/node/node.go
@@ -110,10 +110,9 @@ func NewNode(config *cfg.Config) *Node {
 
        if !config.Wallet.Disable {
                walletDB := dbm.NewDB("wallet", config.DBBackend, config.DBDir())
-               walletStore := database.NewWalletStore(walletDB)
                accounts = account.NewManager(walletDB, chain)
                assets = asset.NewRegistry(walletDB, chain)
-               wallet, err = w.NewWallet(walletStore, accounts, assets, hsm, chain, dispatcher, config.Wallet.TxIndex)
+               wallet, err = w.NewWallet(walletDB, accounts, assets, hsm, chain, dispatcher, config.Wallet.TxIndex)
                if err != nil {
                        log.WithFields(log.Fields{"module": logModule, "error": err}).Error("init NewWallet")
                }

diff --git a/test/wallet_test_util.go b/test/wallet_test_util.go
index 50636f3..b03b430 100644 (file)
--- a/test/wallet_test_util.go
+++ b/test/wallet_test_util.go
@@ -12,7 +12,6 @@ import (
        "github.com/vapor/blockchain/pseudohsm"
        "github.com/vapor/blockchain/signers"
        "github.com/vapor/crypto/ed25519/chainkd"
-       "github.com/vapor/database"
        dbm "github.com/vapor/database/leveldb"
        "github.com/vapor/event"
        "github.com/vapor/protocol"
@@ -242,11 +241,10 @@ func (cfg *walletTestConfig) Run() error {
                return err
        }
        walletDB := dbm.NewDB("wallet", "leveldb", path.Join(dirPath, "wallet_db"))
-       walletStore := database.NewWalletStore(walletDB)
        accountManager := account.NewManager(walletDB, chain)
        assets := asset.NewRegistry(walletDB, chain)
        dispatcher := event.NewDispatcher()
-       wallet, err := w.NewWallet(walletStore, accountManager, assets, hsm, chain, dispatcher, false)
+       wallet, err := w.NewWallet(walletDB, accountManager, assets, hsm, chain, dispatcher, false)
        if err != nil {
                return err
        }

diff --git a/wallet/wallet.go b/wallet/wallet.go
index 6242f40..bcf287b 100644 (file)
--- a/wallet/wallet.go
+++ b/wallet/wallet.go
@@ -10,6 +10,7 @@ import (
        "github.com/vapor/asset"
        "github.com/vapor/blockchain/pseudohsm"
        "github.com/vapor/database"
+       dbm "github.com/vapor/database/leveldb"
        "github.com/vapor/errors"
        "github.com/vapor/event"
        "github.com/vapor/protocol"
@@ -57,7 +58,8 @@ type Wallet struct {
 }
 
 //NewWallet return a new wallet instance
-func NewWallet(store database.WalletStorer, account *account.Manager, asset *asset.Registry, hsm *pseudohsm.HSM, chain *protocol.Chain, dispatcher *event.Dispatcher, txIndexFlag bool) (*Wallet, error) {
+func NewWallet(walletDB dbm.DB, account *account.Manager, asset *asset.Registry, hsm *pseudohsm.HSM, chain *protocol.Chain, dispatcher *event.Dispatcher, txIndexFlag bool) (*Wallet, error) {
+       store := database.NewWalletStore(walletDB)
        w := &Wallet{
                store:           store,
                AccountMgr:      account,

diff --git a/wallet/wallet_test.go b/wallet/wallet_test.go
index ae3f009..360d2e7 100644 (file)
--- a/wallet/wallet_test.go
+++ b/wallet/wallet_test.go
@@ -269,7 +269,6 @@ func TestMemPoolTxQueryLoop(t *testing.T) {
        }
        config.CommonConfig = config.DefaultConfig()
        testDB := dbm.NewDB("testdb", "leveldb", dirPath)
-       testStore := database.NewWalletStore(testDB)
        defer func() {
                testDB.Close()
                os.RemoveAll(dirPath)
@@ -325,7 +324,7 @@ func TestMemPoolTxQueryLoop(t *testing.T) {
        //block := mockSingleBlock(tx)
        txStatus := bc.NewTransactionStatus()
        txStatus.SetStatus(0, false)
-       w, err := NewWallet(testStore, accountManager, reg, hsm, chain, dispatcher, false)
+       w, err := NewWallet(testDB, accountManager, reg, hsm, chain, dispatcher, false)
        go w.memPoolTxQueryLoop()
        w.eventDispatcher.Post(protocol.TxMsgEvent{TxMsg: &protocol.TxPoolMsg{TxDesc: &protocol.TxDesc{Tx: tx}, MsgType: protocol.MsgNewTx}})
        time.Sleep(time.Millisecond * 10)