OSDN Git Service

Fix txfeed panic when wallet disabled (#151)
authoryahtoo <yahtoo.ma@gmail.com>
Thu, 30 Nov 2017 02:29:11 +0000 (10:29 +0800)
committerPaladz <yzhu101@uottawa.ca>
Thu, 30 Nov 2017 02:29:11 +0000 (10:29 +0800)
node/node.go

index f5546fa..887fa07 100755 (executable)
@@ -190,6 +190,14 @@ func NewNode(config *cfg.Config) *Node {
        var wallet *w.Wallet = nil
        var txFeed *txfeed.Tracker = nil
 
+       txFeedDB := dbm.NewDB("txfeeds", config.DBBackend, config.DBDir())
+       txFeed = txfeed.NewTracker(txFeedDB, chain)
+
+       if err = txFeed.Prepare(ctx); err != nil {
+               log.WithField("error", err).Error("start txfeed")
+               return nil
+       }
+
        if config.Wallet.Enable {
                accountsDB := dbm.NewDB("account", config.DBBackend, config.DBDir())
                assetsDB := dbm.NewDB("asset", config.DBBackend, config.DBDir())
@@ -204,14 +212,6 @@ func NewNode(config *cfg.Config) *Node {
 
                go wallet.WalletUpdate(chain)
 
-               txFeedDB := dbm.NewDB("txfeeds", config.DBBackend, config.DBDir())
-               txFeed = txfeed.NewTracker(txFeedDB, chain)
-
-               if err = txFeed.Prepare(ctx); err != nil {
-                       log.WithField("error", err).Error("start txfeed")
-                       return nil
-               }
-
        }
        //Todo HSM
        /*