OSDN Git Service

Del ErrorHandler function
authorYahtoo Ma <yahtoo.ma@gmail.com>
Fri, 2 Aug 2019 06:13:34 +0000 (14:13 +0800)
committerYahtoo Ma <yahtoo.ma@gmail.com>
Fri, 2 Aug 2019 06:13:34 +0000 (14:13 +0800)
netsync/block_keeper.go
netsync/peer.go

index 516dc6f..298f6bb 100644 (file)
@@ -369,7 +369,7 @@ func (bk *blockKeeper) startSync() bool {
                bk.syncPeer = peer
                if err := bk.fastBlockSync(checkPoint); err != nil {
                        log.WithFields(log.Fields{"module": logModule, "err": err}).Warning("fail on fastBlockSync")
-                       bk.peers.ErrorHandler(peer.ID(), security.LevelMsgIllegal, err)
+                       bk.peers.ProcessIllegal(peer.ID(), security.LevelMsgIllegal, err.Error())
                        return false
                }
                return true
@@ -386,7 +386,7 @@ func (bk *blockKeeper) startSync() bool {
 
                if err := bk.regularBlockSync(targetHeight); err != nil {
                        log.WithFields(log.Fields{"module": logModule, "err": err}).Warning("fail on regularBlockSync")
-                       bk.peers.ErrorHandler(peer.ID(), security.LevelMsgIllegal, err)
+                       bk.peers.ProcessIllegal(peer.ID(), security.LevelMsgIllegal, err.Error())
                        return false
                }
                return true
index 6c69b3b..4ce8881 100644 (file)
@@ -409,14 +409,6 @@ func (ps *peerSet) broadcastTx(tx *types.Tx) error {
        return nil
 }
 
-func (ps *peerSet) ErrorHandler(peerID string, level byte, err error) {
-       if errors.Root(err) == ErrPeerMisbehave {
-               ps.ProcessIllegal(peerID, level, err.Error())
-       } else {
-               ps.removePeer(peerID)
-       }
-}
-
 // Peer retrieves the registered peer with the given id.
 func (ps *peerSet) getPeer(id string) *peer {
        ps.mtx.RLock()