From c4b5e1d3e517bc15ff248c910582030fc2d96717 Mon Sep 17 00:00:00 2001 From: Yahtoo Ma Date: Fri, 2 Aug 2019 14:13:34 +0800 Subject: [PATCH] Del ErrorHandler function --- netsync/block_keeper.go | 4 ++-- netsync/peer.go | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/netsync/block_keeper.go b/netsync/block_keeper.go index 516dc6f9..298f6bb4 100644 --- a/netsync/block_keeper.go +++ b/netsync/block_keeper.go @@ -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 diff --git a/netsync/peer.go b/netsync/peer.go index 6c69b3b0..4ce8881e 100644 --- a/netsync/peer.go +++ b/netsync/peer.go @@ -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() -- 2.11.0