Revert "log into file (#357)"

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

diff --git a/node/node.go b/node/node.go
index 8469de7..531ff83 100644 (file)
--- a/node/node.go
+++ b/node/node.go
@@ -71,11 +71,13 @@ func NewNode(config *cfg.Config) *Node {
                "pubkey":             config.PrivateKey().XPub(),
                "fed_xpubs":          config.Federation.Xpubs,
                "fed_quorum":         config.Federation.Quorum,
-               "fed_controlprogram": hex.EncodeToString(cfg.FederationProgrom(config)),
+               "fed_controlprogram": hex.EncodeToString(cfg.FederationWScript(config)),
        }).Info()
 
        initLogFile(config)
-       initActiveNetParams(config)
+       if err := consensus.InitActiveNetParams(config.ChainID); err != nil {
+               log.Fatalf("Failed to init ActiveNetParams:[%s]", err.Error())
+       }
        initCommonConfig(config)
 
        // Get store
@@ -110,9 +112,11 @@ func NewNode(config *cfg.Config) *Node {
 
        if !config.Wallet.Disable {
                walletDB := dbm.NewDB("wallet", config.DBBackend, config.DBDir())
-               accounts = account.NewManager(walletDB, chain)
+               walletStore := database.NewWalletStore(walletDB)
+               accountStore := database.NewAccountStore(walletDB)
+               accounts = account.NewManager(accountStore, chain)
                assets = asset.NewRegistry(walletDB, chain)
-               wallet, err = w.NewWallet(walletDB, accounts, assets, hsm, chain, dispatcher, config.Wallet.TxIndex)
+               wallet, err = w.NewWallet(walletStore, accounts, assets, hsm, chain, dispatcher, config.Wallet.TxIndex)
                if err != nil {
                        log.WithFields(log.Fields{"module": logModule, "error": err}).Error("init NewWallet")
                }
@@ -122,8 +126,8 @@ func NewNode(config *cfg.Config) *Node {
                        wallet.RescanBlocks()
                }
        }
-
-       syncManager, err := netsync.NewSyncManager(config, chain, txPool, dispatcher)
+       fastSyncDB := dbm.NewDB("fastsync", config.DBBackend, config.DBDir())
+       syncManager, err := netsync.NewSyncManager(config, chain, txPool, dispatcher, fastSyncDB)
        if err != nil {
                cmn.Exit(cmn.Fmt("Failed to create sync manager: %v", err))
        }
@@ -133,7 +137,7 @@ func NewNode(config *cfg.Config) *Node {
        // run the profile server
        profileHost := config.ProfListenAddress
        if profileHost != "" {
-               // Profiling bytomd programs.see (https://blog.golang.org/profiling-go-programs)
+               // Profiling vapord programs.see (https://blog.golang.org/profiling-go-programs)
                // go tool pprof http://profileHose/debug/pprof/heap
                go func() {
                        if err = http.ListenAndServe(profileHost, nil); err != nil {
@@ -161,7 +165,7 @@ func NewNode(config *cfg.Config) *Node {
 
 // find whether config xpubs equal genesis block xpubs
 func checkConfig(chain *protocol.Chain, config *cfg.Config) error {
-       fedpegScript := cfg.FederationProgrom(config)
+       fedpegScript := cfg.FederationWScript(config)
        genesisBlock, err := chain.GetBlockByHeight(0)
        if err != nil {
                return err
@@ -184,14 +188,6 @@ func lockDataDirectory(config *cfg.Config) error {
        return nil
 }
 
-func initActiveNetParams(config *cfg.Config) {
-       var exist bool
-       consensus.ActiveNetParams, exist = consensus.NetParams[config.ChainID]
-       if !exist {
-               cmn.Exit(cmn.Fmt("chain_id[%v] don't exist", config.ChainID))
-       }
-}
-
 func initLogFile(config *cfg.Config) {
        if config.LogFile == "" {
                return