Adjust wallet code structure (#197)

[bytom/bytom.git] / node / node.go

diff --git a/node/node.go b/node/node.go
index b47f1d5..91045ca 100755 (executable)
--- a/node/node.go
+++ b/node/node.go
@@ -199,16 +199,13 @@ func NewNode(config *cfg.Config) *Node {
        }
 
        if config.Wallet.Enable {
-               accountsDB := dbm.NewDB("account", config.DBBackend, config.DBDir())
-               assetsDB := dbm.NewDB("asset", config.DBBackend, config.DBDir())
+
                walletDB := dbm.NewDB("wallet", config.DBBackend, config.DBDir())
 
-               accounts = account.NewManager(accountsDB, walletDB, chain)
-               assets = asset.NewRegistry(assetsDB, chain)
+               accounts = account.NewManager(walletDB, chain)
+               assets = asset.NewRegistry(walletDB, chain)
 
-               wallet = w.NewWallet(walletDB, accounts, assets)
-               wallet.Ind.RegisterAnnotator(accounts.AnnotateTxs)
-               wallet.Ind.RegisterAnnotator(assets.AnnotateTxs)
+               wallet = w.NewWallet(walletDB)
 
                go wallet.WalletUpdate(chain)