From 0c9ee5ae3f9eb1893bd2948bbfe911964b84c9d7 Mon Sep 17 00:00:00 2001 From: Daniil Ankushin Date: Fri, 17 Jan 2025 14:23:20 +0300 Subject: [PATCH] Bump golangci-lint and add linters (#2382) * Update golangci-lint * Remove unused nolint * Add UseTesting linter * Add nilnesserr linter --- .golangci.yaml | 2 ++ Makefile | 2 +- vm/vm.go | 2 +- vm/vm_test.go | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index debb50b506..3723fd118d 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -110,6 +110,8 @@ linters: - tparallel - gci - exhaustruct + - usetesting + - nilnesserr # don't enable: # - asciicheck diff --git a/Makefile b/Makefile index 007e2d0525..3bd99cb17b 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,7 @@ install-mockgen: go install go.uber.org/mock/mockgen@latest install-golangci-lint: - @which golangci-lint || go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2 + @which golangci-lint || go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4 lint: install-golangci-lint ## Run linter golangci-lint run diff --git a/vm/vm.go b/vm/vm.go index e3b0bdd90e..882a1af825 100644 --- a/vm/vm.go +++ b/vm/vm.go @@ -341,7 +341,7 @@ func (v *vm) Execute(txns []core.Transaction, declaredClasses []core.Class, paid return context.actualFees, context.daGas, traces, context.executionSteps, nil } -func marshalTxnsAndDeclaredClasses(txns []core.Transaction, declaredClasses []core.Class) (json.RawMessage, json.RawMessage, error) { //nolint:lll +func marshalTxnsAndDeclaredClasses(txns []core.Transaction, declaredClasses []core.Class) (json.RawMessage, json.RawMessage, error) { txnJSONs := make([]json.RawMessage, 0, len(txns)) for _, txn := range txns { txnJSON, err := marshalTxn(txn) diff --git a/vm/vm_test.go b/vm/vm_test.go index c5744ddf83..2e9c99c521 100644 --- a/vm/vm_test.go +++ b/vm/vm_test.go @@ -224,7 +224,7 @@ func TestSetVersionedConstants(t *testing.T) { assert.NoError(t, err) }) t.Run("not valid json", func(t *testing.T) { - fd, err := os.CreateTemp("", "versioned_constants_test*") + fd, err := os.CreateTemp(t.TempDir(), "versioned_constants_test*") require.NoError(t, err) defer os.Remove(fd.Name())