diff --git a/.golangci.yml b/.golangci.yml index def3e2a3d8d..30ed8f9bbae 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -28,7 +28,6 @@ linters: - prealloc - predeclared - promlinter - - staticcheck - thelper - typecheck - unconvert diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go index 05cd074010b..3ec9ec7cf34 100644 --- a/pkg/api/metrics.go +++ b/pkg/api/metrics.go @@ -108,8 +108,7 @@ type UpgradedResponseWriter interface { http.Pusher http.Hijacker http.Flusher - // lint:ignore SA1019 CloseNotifier interface is required by gorilla compress handler - // nolint:staticcheck + //lint:ignore SA1019 CloseNotifier interface is required by gorilla compress handler http.CloseNotifier } diff --git a/pkg/log/httpaccess/http_access.go b/pkg/log/httpaccess/http_access.go index 24b936c7dae..9c8ee95fef8 100644 --- a/pkg/log/httpaccess/http_access.go +++ b/pkg/log/httpaccess/http_access.go @@ -113,8 +113,7 @@ func (rr *responseRecorder) WriteHeader(s int) { // CloseNotify implements http.CloseNotifier. func (rr *responseRecorder) CloseNotify() <-chan bool { - // nolint:staticcheck - // lint:ignore SA1019 CloseNotifier interface is required by gorilla compress handler + //lint:ignore SA1019 CloseNotifier interface is required by gorilla compress handler return rr.ResponseWriter.(http.CloseNotifier).CloseNotify() } diff --git a/pkg/p2p/libp2p/libp2p.go b/pkg/p2p/libp2p/libp2p.go index d7250a517fb..645703e93a8 100644 --- a/pkg/p2p/libp2p/libp2p.go +++ b/pkg/p2p/libp2p/libp2p.go @@ -55,7 +55,6 @@ import ( ocprom "contrib.go.opencensus.io/exporter/prometheus" m2 "github.com/ethersphere/bee/pkg/metrics" - rcmgrObs "github.com/libp2p/go-libp2p/p2p/host/resource-manager" "github.com/prometheus/client_golang/prometheus" ) @@ -175,7 +174,7 @@ func New(ctx context.Context, signer beecrypto.Signer, networkID uint64, overlay } if o.Registry != nil { - rcmgrObs.MustRegisterWith(o.Registry) + rcmgr.MustRegisterWith(o.Registry) } _, err = ocprom.NewExporter(ocprom.Options{ @@ -201,7 +200,7 @@ func New(ctx context.Context, signer beecrypto.Signer, networkID uint64, overlay // The resource manager expects a limiter, se we create one from our limits. limiter := rcmgr.NewFixedLimiter(limits) - str, err := rcmgrObs.NewStatsTraceReporter() + str, err := rcmgr.NewStatsTraceReporter() if err != nil { return nil, err } diff --git a/pkg/storage/leveldbstore/recovery_test.go b/pkg/storage/leveldbstore/recovery_test.go index f3d504f6e62..8ffa8b183de 100644 --- a/pkg/storage/leveldbstore/recovery_test.go +++ b/pkg/storage/leveldbstore/recovery_test.go @@ -23,7 +23,7 @@ type obj struct { } func (o *obj) ID() string { return o.Key } -func (_ *obj) Namespace() string { return "obj" } +func (*obj) Namespace() string { return "obj" } func (o *obj) Marshal() ([]byte, error) { return json.Marshal(o) } func (o *obj) Unmarshal(buf []byte) error { return json.Unmarshal(buf, o) } func (o *obj) Clone() storage.Item { return &obj{Key: o.Key, Val: slices.Clone(o.Val)} }