From b988cb65ea353dcb786207dd9f9509e2a5c6d86c Mon Sep 17 00:00:00 2001 From: lightclient Date: Tue, 24 Feb 2026 16:12:22 +0000 Subject: [PATCH] eth/protocols: use errors.Is instead of errors.Unwrap --- eth/protocols/eth/handshake.go | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/eth/protocols/eth/handshake.go b/eth/protocols/eth/handshake.go index f8551acbc7..4d1b6e9de7 100644 --- a/eth/protocols/eth/handshake.go +++ b/eth/protocols/eth/handshake.go @@ -191,22 +191,16 @@ func markError(p *Peer, err error) { return } m := meters.get(p.Inbound()) - - base := errors.Unwrap(err) - if base == nil { - base = err - } - - switch base { - case errNetworkIDMismatch: + switch { + case errors.Is(err, errNetworkIDMismatch): m.networkIDMismatch.Mark(1) - case errProtocolVersionMismatch: + case errors.Is(err, errProtocolVersionMismatch): m.protocolVersionMismatch.Mark(1) - case errGenesisMismatch: + case errors.Is(err, errGenesisMismatch): m.genesisMismatch.Mark(1) - case errForkIDRejected: + case errors.Is(err, errForkIDRejected): m.forkidRejected.Mark(1) - case p2p.DiscReadTimeout: + case errors.Is(err, p2p.DiscReadTimeout): m.timeoutError.Mark(1) default: m.peerError.Mark(1)