From c2ab3b4651dcf8ec09ca7facf94a2fbcb2344331 Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Mon, 15 Jan 2024 13:37:49 -0500 Subject: [PATCH] refactor: switch to EndForAbuse --- service/p2p.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/service/p2p.go b/service/p2p.go index e8aa03c..f2099c7 100644 --- a/service/p2p.go +++ b/service/p2p.go @@ -213,7 +213,7 @@ func (p *P2PImpl) ConnectToNode(connectionUris []*url.URL, retried bool, fromPee p.incomingIPBlocklist.Put(fromPeerIP, true) blocked = true } - err = fromPeer.End() + err = fromPeer.EndForAbuse() if err != nil { return err } @@ -272,7 +272,7 @@ func (p *P2PImpl) ConnectToNode(connectionUris []*url.URL, retried bool, fromPee p.incomingIPBlocklist.Put(fromPeerIP, true) blocked = true } - err = fromPeer.End() + err = fromPeer.EndForAbuse() if err != nil { return err } @@ -329,7 +329,7 @@ func (p *P2PImpl) ConnectToNode(connectionUris []*url.URL, retried bool, fromPee go func() { err := p.OnNewPeer(peer, true) - if err != nil { + if err != nil && !peer.Abused() { p.logger.Error("peer error", zap.Error(err)) } p.Node().ConnectionTracker().Done() @@ -354,7 +354,7 @@ func (p *P2PImpl) OnNewPeer(peer net.Peer, verifyId bool) error { if p.incomingIPBlocklist.Contains(pid) { p.logger.Error("peer is on identity blocklist", zap.String("peer", pid)) - err := peer.End() + err := peer.EndForAbuse() if err != nil { return err } @@ -362,7 +362,7 @@ func (p *P2PImpl) OnNewPeer(peer net.Peer, verifyId bool) error { } if p.incomingPeerBlockList.Contains(pip) { p.logger.Debug("peer is on ip blocklist", zap.String("peer", pid), zap.String("ip", pip)) - err := peer.End() + err := peer.EndForAbuse() if err != nil { return err }