From 044592642b17b3852b012385e1015ac28bcc83cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 09:27:11 -0500 Subject: [PATCH 1/2] chore(deps): bump golang.org/x/text from 0.4.0 to 0.5.0 (#2988) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9c8d562ac0..083c52109a 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/wasmerio/go-ext-wasm v0.3.2-0.20200326095750-0a32be6068ec golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 - golang.org/x/text v0.4.0 + golang.org/x/text v0.5.0 google.golang.org/protobuf v1.28.1 ) diff --git a/go.sum b/go.sum index 879b837939..ba10328498 100644 --- a/go.sum +++ b/go.sum @@ -1393,8 +1393,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From a1602bc21084919c299bd11218560125404b870b Mon Sep 17 00:00:00 2001 From: Edward Mack Date: Tue, 6 Dec 2022 11:25:36 -0500 Subject: [PATCH 2/2] fix(peerset): check for incoming slot error (#2952) --- dot/peerset/peerset.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dot/peerset/peerset.go b/dot/peerset/peerset.go index dea6956f90..b031de1d33 100644 --- a/dot/peerset/peerset.go +++ b/dot/peerset/peerset.go @@ -5,6 +5,7 @@ package peerset import ( "context" + "errors" "fmt" "math" "strings" @@ -641,7 +642,11 @@ func (ps *PeerSet) incoming(setID int, peers ...peer.ID) error { } else { err := state.tryAcceptIncoming(setID, pid) if err != nil { - logger.Errorf("cannot accept incomming peer %s: %s", pid, err) + if errors.Is(err, ErrIncomingSlotsUnavailable) { + logger.Debugf("cannot accept incoming peer %s: %s", pid, err) + } else { + logger.Errorf("cannot accept incoming peer %s: %s", pid, err) + } message.Status = Reject } else { logger.Debugf("incoming connection accepted from peer %s", pid)