From: icodezjb <icodezjb@163.com>
Date: Mon, 27 Nov 2017 02:37:07 +0000 (+0800)
Subject: Update for hsm_test (#131)
X-Git-Tag: v1.0.5-alpha~618
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4890e88e4a448b38de0417e878e413d1da9c0289;p=bytom%2Fbytom-spv.git

Update for hsm_test (#131)

* Update for hsm_test
---

diff --git a/blockchain/hsm_test.go b/blockchain/hsm_test.go
old mode 100644
new mode 100755
index 129c7054..18024dd8
--- a/blockchain/hsm_test.go
+++ b/blockchain/hsm_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/bytom/blockchain/pseudohsm"
 	"github.com/bytom/blockchain/txbuilder"
 	"github.com/bytom/blockchain/txdb"
+	w "github.com/bytom/blockchain/wallet"
 	cfg "github.com/bytom/config"
 	"github.com/bytom/crypto/ed25519/chainkd"
 	"github.com/bytom/protocol"
@@ -34,7 +35,6 @@ func TestHSM(t *testing.T) {
 	store := txdb.NewStore(tc)
 
 	var accounts *account.Manager
-	var wallet *account.Wallet
 	var assets *asset.Registry
 	genesisBlock := cfg.GenerateGenesisBlock()
 	// tx pool init
@@ -53,14 +53,11 @@ func TestHSM(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	walletDB := dbm.NewDB("wallet", config.DBBackend, config.DBDir())
-
 	accountsDB := dbm.NewDB("account", config.DBBackend, dir)
-	wallet = account.NewWallet(walletDB)
-	accounts = account.NewManager(accountsDB, chain, wallet)
-	//accounts.IndexAccounts(query.NewIndexer(accountsDB, chain))
-
 	assetsDB := dbm.NewDB("asset", config.DBBackend, dir)
+	walletDB := dbm.NewDB("wallet", config.DBBackend, config.DBDir())
+
+	accounts = account.NewManager(accountsDB, walletDB, w.GetWalletHeight, chain)
 	assets = asset.NewRegistry(assetsDB, chain)
 
 	hsm, err := pseudohsm.New(dirPath)