delete generate block for api

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

diff --git a/node/node.go b/node/node.go
index 0c7cfa4..8021a66 100644 (file)
--- a/node/node.go
+++ b/node/node.go
@@ -33,7 +33,6 @@ import (
        "github.com/vapor/database/leveldb"
        "github.com/vapor/env"
        "github.com/vapor/mining/miner"
-       "github.com/vapor/mining/miningpool"
        "github.com/vapor/net/websocket"
        "github.com/vapor/netsync"
        "github.com/vapor/protocol"
@@ -67,7 +66,6 @@ type Node struct {
        //cpuMiner        *cpuminer.CPUMiner
        miner *miner.Miner
 
-       miningPool   *miningpool.MiningPool
        miningEnable bool
 
        newBlockCh chan *bc.Hash
@@ -174,7 +172,6 @@ func NewNode(config *cfg.Config) *Node {
        //node.cpuMiner = cpuminer.NewCPUMiner(chain, accounts, txPool, newBlockCh)
        consensusEngine = createConsensusEngine(config, store)
        node.miner = miner.NewMiner(chain, accounts, txPool, newBlockCh, consensusEngine)
-       node.miningPool = miningpool.NewMiningPool(chain, accounts, txPool, newBlockCh)
 
        node.BaseService = *cmn.NewBaseService(nil, "Node", node)
 
@@ -231,17 +228,6 @@ func initActiveNetParams(config *cfg.Config) {
                consensus.ActiveNetParams.FedpegXPubs = federationRedeemXPubs
        }
 
-       if config.Side.SignBlockXPubs != "" {
-               var signBlockXPubs []chainkd.XPub
-               xPubs := strings.Split(config.Side.SignBlockXPubs, ",")
-               for _, xpubStr := range xPubs {
-                       var xpub chainkd.XPub
-                       xpub.UnmarshalText([]byte(xpubStr))
-                       signBlockXPubs = append(signBlockXPubs, xpub)
-               }
-               consensus.ActiveNetParams.SignBlockXPubs = signBlockXPubs
-       }
-
        consensus.ActiveNetParams.Signer = config.Signer
        consensus.ActiveNetParams.PeginMinDepth = config.Side.PeginMinDepth
        consensus.ActiveNetParams.ParentGenesisBlockHash = config.Side.ParentGenesisBlockHash
@@ -276,7 +262,7 @@ func launchWebBrowser(port string) {
 }
 
 func (n *Node) initAndstartApiServer() {
-       n.api = api.NewAPI(n.syncManager, n.wallet, n.txfeed, n.miner, n.miningPool, n.chain, n.config, n.accessTokens, n.newBlockCh, n.notificationMgr)
+       n.api = api.NewAPI(n.syncManager, n.wallet, n.txfeed, n.miner, n.chain, n.config, n.accessTokens, n.newBlockCh, n.notificationMgr)
 
        listenAddr := env.String("LISTEN", n.config.ApiAddress)
        env.Parse()
@@ -333,10 +319,6 @@ func (n *Node) SyncManager() *netsync.SyncManager {
        return n.syncManager
 }
 
-func (n *Node) MiningPool() *miningpool.MiningPool {
-       return n.miningPool
-}
-
 /**bytomdRPCCheck Check if bytomd connection via RPC is correctly working*/
 func bytomdRPCCheck() bool {
        type Req struct {
@@ -355,7 +337,7 @@ func bytomdRPCCheck() bool {
                        json.Unmarshal(tmp, &blockHeader)
                        hash := blockHeader.BlockHeader.Hash()
                        if strings.Compare(consensus.ActiveNetParams.ParentGenesisBlockHash, hash.String()) != 0 {
-                               log.Error("Invalid parent genesis block hash response via RPC. Contacting wrong parent daemon?", consensus.ActiveNetParams.ParentGenesisBlockHash, hash.String())
+                               log.Error("Invalid parent genesis block hash response via RPC. Contacting wrong parent daemon?", consensus.ActiveNetParams.ParentGenesisBlockHash, ":", hash.String())
                                return false
                        }
                        break
@@ -379,6 +361,7 @@ func initConsensusConfig(config *cfg.Config) {
                if err := json.NewDecoder(file).Decode(config); err != nil {
                        cmn.Exit(cmn.Fmt("invalid consensus file: %v", err))
                }
+
                for _, v := range config.Consensus.Dpos.SelfVoteSigners {
                        address, err := common.DecodeAddress(v, &consensus.ActiveNetParams)
                        if err != nil {