From 96d19455c02f00fe97ca4dbba237eb7750f425dc Mon Sep 17 00:00:00 2001 From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:27:53 -0600 Subject: [PATCH] Revert "eth: when snap is complaining for missing eth, be verbose about the details (#28249)" This reverts commit 42fdae7d1113b5b2e91e85983a25574fef5cae38. --- eth/handler.go | 2 +- eth/peerset.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/eth/handler.go b/eth/handler.go index 0c0c17fee16e..665df7d8cf85 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -462,7 +462,7 @@ func (h *handler) runSnapExtension(peer *snap.Peer, handler snap.Handler) error snap.EgressRegistrationErrorMeter.Mark(1) } } - peer.Log().Debug("Snapshot extension registration failed", "err", err) + peer.Log().Warn("Snapshot extension registration failed", "err", err) return err } return handler(peer) diff --git a/eth/peerset.go b/eth/peerset.go index b27d3964a119..b9cc1e03aca3 100644 --- a/eth/peerset.go +++ b/eth/peerset.go @@ -18,7 +18,6 @@ package eth import ( "errors" - "fmt" "math/big" "sync" @@ -75,7 +74,7 @@ func (ps *peerSet) registerSnapExtension(peer *snap.Peer) error { // Reject the peer if it advertises `snap` without `eth` as `snap` is only a // satellite protocol meaningful with the chain selection of `eth` if !peer.RunningCap(eth.ProtocolName, eth.ProtocolVersions) { - return fmt.Errorf("%w: have %v", errSnapWithoutEth, peer.Caps()) + return errSnapWithoutEth } // Ensure nobody can double connect ps.lock.Lock()