Del unused block_fetcher function

diff --git a/netsync/block_fetcher.go b/netsync/block_fetcher.go
deleted file mode 100644 (file)
index 2949f7b..0000000
--- a/netsync/block_fetcher.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package netsync
-
-import (
-       log "github.com/sirupsen/logrus"
-       "gopkg.in/karalabe/cookiejar.v2/collections/prque"
-
-       "github.com/bytom/protocol/bc"
-)
-
-const (
-       maxBlockDistance = 64
-       maxMsgSetSize    = 128
-       newBlockChSize   = 64
-)
-
-// blockFetcher is responsible for accumulating block announcements from various peers
-// and scheduling them for retrieval.
-type blockFetcher struct {
-       chain Chain
-       peers *peerSet
-
-       newBlockCh chan *blockMsg
-       queue      *prque.Prque
-       msgSet     map[bc.Hash]*blockMsg
-}
-
-//NewBlockFetcher creates a block fetcher to retrieve blocks of the new mined.
-func newBlockFetcher(chain Chain, peers *peerSet) *blockFetcher {
-       f := &blockFetcher{
-               chain:      chain,
-               peers:      peers,
-               newBlockCh: make(chan *blockMsg, newBlockChSize),
-               queue:      prque.New(),
-               msgSet:     make(map[bc.Hash]*blockMsg),
-       }
-       go f.blockProcessor()
-       return f
-}
-
-func (f *blockFetcher) blockProcessor() {
-       for {
-               height := f.chain.BestBlockHeight()
-               for !f.queue.Empty() {
-                       msg := f.queue.PopItem().(*blockMsg)
-                       if msg.block.Height > height+1 {
-                               f.queue.Push(msg, -float32(msg.block.Height))
-                               break
-                       }
-
-                       f.insert(msg)
-                       delete(f.msgSet, msg.block.Hash())
-               }
-               f.add(<-f.newBlockCh)
-       }
-}
-
-func (f *blockFetcher) add(msg *blockMsg) {
-       bestHeight := f.chain.BestBlockHeight()
-       if len(f.msgSet) > maxMsgSetSize || bestHeight > msg.block.Height || msg.block.Height-bestHeight > maxBlockDistance {
-               return
-       }
-
-       blockHash := msg.block.Hash()
-       if _, ok := f.msgSet[blockHash]; !ok {
-               f.msgSet[blockHash] = msg
-               f.queue.Push(msg, -float32(msg.block.Height))
-               log.WithField("block height", msg.block.Height).Debug("fetcher receive mine block")
-       }
-}
-
-func (f *blockFetcher) insert(msg *blockMsg) {
-       if _, err := f.chain.ProcessBlock(msg.block); err != nil {
-               peer := f.peers.getPeer(msg.peerID)
-               if peer == nil {
-                       return
-               }
-
-               f.peers.addBanScore(msg.peerID, 20, 0, err.Error())
-               return
-       }
-
-       if err := f.peers.broadcastMinedBlock(msg.block); err != nil {
-               log.WithField("err", err).Error("fail on fetcher broadcast new block")
-               return
-       }
-}
-
-func (f *blockFetcher) processNewBlock(msg *blockMsg) {
-       f.newBlockCh <- msg
-}

diff --git a/netsync/handle.go b/netsync/handle.go
index 6c9b00a..85f0a16 100644 (file)
--- a/netsync/handle.go
+++ b/netsync/handle.go
@@ -52,7 +52,6 @@ type SyncManager struct {
        privKey      crypto.PrivKeyEd25519 // local node's p2p key
        chain        Chain
        txPool       *core.TxPool
-       blockFetcher *blockFetcher
        blockKeeper  *blockKeeper
        peers        *peerSet
 
@@ -81,7 +80,6 @@ func NewSyncManager(config *cfg.Config, chain Chain, txPool *core.TxPool, newBlo
                txPool:       txPool,
                chain:        chain,
                privKey:      crypto.GenPrivKeyEd25519(),
-               blockFetcher: newBlockFetcher(chain, peers),
                blockKeeper:  newBlockKeeper(chain, peers),
                peers:        peers,
                newTxCh:      make(chan *types.Tx, maxTxChanSize),
@@ -255,19 +253,6 @@ func (sm *SyncManager) handleHeadersMsg(peer *peer, msg *HeadersMessage) {
        sm.blockKeeper.processHeaders(peer.ID(), headers)
 }
 
-func (sm *SyncManager) handleMineBlockMsg(peer *peer, msg *MineBlockMessage) {
-       block, err := msg.GetMineBlock()
-       if err != nil {
-               log.WithField("err", err).Warning("fail on handleMineBlockMsg GetMineBlock")
-               return
-       }
-
-       hash := block.Hash()
-       peer.markBlock(&hash)
-       sm.blockFetcher.processNewBlock(&blockMsg{peerID: peer.ID(), block: block})
-       peer.setStatus(block.Height, &hash)
-}
-
 func (sm *SyncManager) handleStatusRequestMsg(peer BasePeer) {
        bestHeader := sm.chain.BestBlockHeader()
        genesisBlock, err := sm.chain.GetBlockByHeight(0)