Merge branch 'dev' into dev-verify

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

diff --git a/node/node.go b/node/node.go
index 9cfb885..5f82e93 100644 (file)
--- a/node/node.go
+++ b/node/node.go
@@ -19,7 +19,6 @@ import (
        "github.com/bytom/blockchain/txfeed"
        cfg "github.com/bytom/config"
        "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519/chainkd"
        "github.com/bytom/database/leveldb"
        "github.com/bytom/env"
        "github.com/bytom/mining/cpuminer"
@@ -61,16 +60,15 @@ func NewNode(config *cfg.Config) *Node {
        ctx := context.Background()
        initActiveNetParams(config)
        // Get store
-       txDB := dbm.NewDB("txdb", config.DBBackend, config.DBDir())
-       store := leveldb.NewStore(txDB)
+       coreDB := dbm.NewDB("core", config.DBBackend, config.DBDir())
+       store := leveldb.NewStore(coreDB)
 
        tokenDB := dbm.NewDB("accesstoken", config.DBBackend, config.DBDir())
        accessTokens := accesstoken.NewStore(tokenDB)
 
        // Make event switch
        eventSwitch := types.NewEventSwitch()
-       _, err := eventSwitch.Start()
-       if err != nil {
+       if _, err := eventSwitch.Start(); err != nil {
                cmn.Exit(cmn.Fmt("Failed to start switch: %v", err))
        }
 
@@ -107,10 +105,6 @@ func NewNode(config *cfg.Config) *Node {
                        log.WithField("error", err).Error("init NewWallet")
                }
 
-               if err := initOrRecoverAccount(hsm, wallet); err != nil {
-                       log.WithField("error", err).Error("initialize or recover account")
-               }
-
                // Clean up expired UTXO reservations periodically.
                go accounts.ExpireReservations(ctx, expireReservationsPeriod)
        }
@@ -155,26 +149,6 @@ func initActiveNetParams(config *cfg.Config) {
        }
 }
 
-func initOrRecoverAccount(hsm *pseudohsm.HSM, wallet *w.Wallet) error {
-       xpubs := hsm.ListKeys()
-
-       if len(xpubs) == 0 {
-               xpub, err := hsm.XCreate("default", "123456")
-               if err != nil {
-                       return err
-               }
-
-               wallet.AccountMgr.Create(nil, []chainkd.XPub{xpub.XPub}, 1, "default")
-               return nil
-       }
-
-       if _, err := wallet.AccountMgr.ListAccounts(""); err != nil {
-               return err
-       }
-
-       return nil
-}
-
 // Lanch web broser or not
 func lanchWebBroser() {
        log.Info("Launching System Browser with :", webAddress)