improve net sync test cases (#375)

[bytom/vapor.git] / netsync / consensusmgr / block_fetcher.go

diff --git a/netsync/consensusmgr/block_fetcher.go b/netsync/consensusmgr/block_fetcher.go
index 3b6c746..8c28ff9 100644 (file)
--- a/netsync/consensusmgr/block_fetcher.go
+++ b/netsync/consensusmgr/block_fetcher.go
@@ -4,7 +4,7 @@ import (
        "github.com/sirupsen/logrus"
        "gopkg.in/karalabe/cookiejar.v2/collections/prque"
 
-       "github.com/vapor/netsync/peers"
+       "github.com/vapor/p2p/security"
        "github.com/vapor/protocol/bc"
 )
 
@@ -18,7 +18,7 @@ const (
 // and scheduling them for retrieval.
 type blockFetcher struct {
        chain Chain
-       peers *peers.PeerSet
+       peers Peers
 
        newBlockCh chan *blockMsg
        queue      *prque.Prque
@@ -26,7 +26,7 @@ type blockFetcher struct {
 }
 
 //NewBlockFetcher creates a block fetcher to retrieve blocks of the new propose.
-func newBlockFetcher(chain Chain, peers *peers.PeerSet) *blockFetcher {
+func newBlockFetcher(chain Chain, peers Peers) *blockFetcher {
        f := &blockFetcher{
                chain:      chain,
                peers:      peers,
@@ -80,7 +80,7 @@ func (f *blockFetcher) insert(msg *blockMsg) {
                        return
                }
 
-               f.peers.AddBanScore(msg.peerID, 20, 0, err.Error())
+               f.peers.ProcessIllegal(msg.peerID, security.LevelMsgIllegal, err.Error())
                return
        }
 
@@ -88,8 +88,6 @@ func (f *blockFetcher) insert(msg *blockMsg) {
                return
        }
 
-       hash := msg.block.Hash()
-       f.peers.SetStatus(msg.peerID, msg.block.Height, &hash)
        proposeMsg, err := NewBlockProposeMsg(msg.block)
        if err != nil {
                logrus.WithFields(logrus.Fields{"module": logModule, "err": err}).Error("failed on create BlockProposeMsg")