diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 267e73086af..770dfa1cbbe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: if: runner.os == 'Linux' uses: golangci/golangci-lint-action@v4 with: - version: v1.57.2 + version: v1.59.1 skip-build-cache: true args: --help diff --git a/.golangci.yml b/.golangci.yml index d9ab632a77a..37a9a8b1af5 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -17,7 +17,7 @@ linters: - musttag - contextcheck - wrapcheck - - goerr113 + - err113 - unparam - makezero #TODO: enable me - noctx #TODO: enable me diff --git a/cmd/devnet/scenarios/suite.go b/cmd/devnet/scenarios/suite.go index a3e1c4b3d4c..165924efd04 100644 --- a/cmd/devnet/scenarios/suite.go +++ b/cmd/devnet/scenarios/suite.go @@ -52,7 +52,7 @@ func (s *suite) runSteps(ctx context.Context, scenario *Scenario, steps []*Step) var stepResult StepResult - ctx, stepResult = s.runStep(ctx, scenario, step, err, isFirst, isLast, logger) + ctx, stepResult = s.runStep(ctx, scenario, step, err, isFirst, isLast, logger) //nolint:fatcontext switch { case stepResult.Err == nil: diff --git a/erigon-lib/.golangci.yml b/erigon-lib/.golangci.yml index 43932734cea..d66cd898232 100644 --- a/erigon-lib/.golangci.yml +++ b/erigon-lib/.golangci.yml @@ -16,7 +16,7 @@ linters: - musttag - contextcheck - wrapcheck - - goerr113 + - err113 - unparam - makezero - testifylint #TODO: enable me diff --git a/erigon-lib/tools/golangci_lint.sh b/erigon-lib/tools/golangci_lint.sh index 0421f1be6d7..ada4234150d 100755 --- a/erigon-lib/tools/golangci_lint.sh +++ b/erigon-lib/tools/golangci_lint.sh @@ -2,7 +2,7 @@ scriptDir=$(dirname "${BASH_SOURCE[0]}") scriptName=$(basename "${BASH_SOURCE[0]}") -version="v1.57.2" +version="v1.59.1" if [[ "$1" == "--install-deps" ]] then diff --git a/polygon/heimdall/client.go b/polygon/heimdall/client.go index deb819e877a..6968e47c8e8 100644 --- a/polygon/heimdall/client.go +++ b/polygon/heimdall/client.go @@ -140,9 +140,9 @@ func (c *Client) FetchStateSyncEvents(ctx context.Context, fromID uint64, to tim c.logger.Trace(heimdallLogPrefix("Fetching state sync events"), "queryParams", url.RawQuery) - ctx = withRequestType(ctx, stateSyncRequest) + reqCtx := withRequestType(ctx, stateSyncRequest) - response, err := FetchWithRetry[StateSyncEventsResponse](ctx, c, url, c.logger) + response, err := FetchWithRetry[StateSyncEventsResponse](reqCtx, c, url, c.logger) if err != nil { if errors.Is(err, ErrNoResponse) { // for more info check https://github.com/maticnetwork/heimdall/pull/993