Update golangci-lint to v1.54.2 (#2082)

ava-labs · Sep 22, 2023 · d8b845c · d8b845c
1 parent 1d45599
commit d8b845c
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 23 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -55,12 +55,15 @@ linters-settings:
   goimports:
     local-prefixes: github.com/ava-labs/avalanchego
   depguard:
-    list-type: blacklist
-    packages-with-error-message:
-      - io/ioutil: 'io/ioutil is deprecated. Use package io or os instead.'
-      - github.com/stretchr/testify/assert: 'github.com/stretchr/testify/require should be used instead.'
-      - github.com/golang/mock/gomock: 'go.uber.org/mock/gomock should be used instead.'
-    include-go-root: true
+    rules:
+      packages:
+        deny:
+          - pkg: "io/ioutil"
+            desc: io/ioutil is deprecated. Use package io or os instead.
+          - pkg: "github.com/stretchr/testify/assert"
+            desc: github.com/stretchr/testify/require should be used instead.
+          - pkg: "github.com/golang/mock/gomock"
+            desc: go.uber.org/mock/gomock should be used instead.
   errorlint:
     # Check for plain type assertions and type switches.
     asserts: false

diff --git a/ids/id_test.go b/ids/id_test.go
@@ -149,7 +149,7 @@ func TestIDUnmarshalJSON(t *testing.T) {
 
 func TestIDHex(t *testing.T) {
 	id := ID{'a', 'v', 'a', ' ', 'l', 'a', 'b', 's'}
-	expected := "617661206c616273000000000000000000000000000000000000000000000000"
+	expected := "617661206c616273000000000000000000000000000000000000000000000000" //nolint:gosec
 	require.Equal(t, expected, id.Hex())
 }
 

diff --git a/scripts/lint.sh b/scripts/lint.sh
@@ -32,7 +32,7 @@ fi
 TESTS=${TESTS:-"golangci_lint license_header require_error_is_no_funcs_as_params single_import interface_compliance_nil require_equal_zero require_len_zero require_equal_len require_nil require_no_error_inline_func"}
 
 function test_golangci_lint {
-  go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2
+  go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2
   golangci-lint run --config .golangci.yml
 }
 

diff --git a/utils/timer/adaptive_timeout_manager_test.go b/utils/timer/adaptive_timeout_manager_test.go
@@ -22,7 +22,7 @@ func TestAdaptiveTimeoutManagerInit(t *testing.T) {
 		expectedErr error
 	}
 
-	tests := []test{
+	tests := []*test{
 		{
 			config: AdaptiveTimeoutConfig{
 				InitialTimeout:     time.Second,
@@ -84,7 +84,7 @@ func TestAdaptiveTimeoutManagerInit(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		_, err := NewAdaptiveTimeoutManager(&test.config, "", prometheus.NewRegistry())
+		_, err := NewAdaptiveTimeoutManager(&test.config, "", prometheus.NewRegistry()) //nolint:gosec
 		require.ErrorIs(t, err, test.expectedErr)
 	}
 }

diff --git a/vms/avm/txs/import_tx.go b/vms/avm/txs/import_tx.go
@@ -31,7 +31,7 @@ func (t *ImportTx) InputUTXOs() []*avax.UTXOID {
 	utxos := t.BaseTx.InputUTXOs()
 	for _, in := range t.ImportedIns {
 		in.Symbol = true
-		utxos = append(utxos, &in.UTXOID)
+		utxos = append(utxos, &in.UTXOID) //nolint:gosec
 	}
 	return utxos
 }

diff --git a/vms/avm/vm.go b/vms/avm/vm.go
@@ -535,7 +535,7 @@ func (vm *VM) initGenesis(genesisBytes []byte) error {
 		}
 
 		tx := &txs.Tx{
-			Unsigned: &genesisTx.CreateAssetTx,
+			Unsigned: &genesisTx.CreateAssetTx, //nolint:gosec
 		}
 		if err := vm.parser.InitializeGenesisTx(tx); err != nil {
 			return err

diff --git a/vms/components/avax/base_tx.go b/vms/components/avax/base_tx.go
@@ -35,7 +35,7 @@ type BaseTx struct {
 func (t *BaseTx) InputUTXOs() []*UTXOID {
 	utxos := make([]*UTXOID, len(t.Ins))
 	for i, in := range t.Ins {
-		utxos[i] = &in.UTXOID
+		utxos[i] = &in.UTXOID //nolint:gosec
 	}
 	return utxos
 }

diff --git a/vms/components/avax/utxo_id_test.go b/vms/components/avax/utxo_id_test.go
@@ -57,7 +57,7 @@ func TestUTXOIDLess(t *testing.T) {
 		id2      UTXOID
 		expected bool
 	}
-	tests := []test{
+	tests := []*test{
 		{
 			name:     "same",
 			id1:      UTXOID{},
@@ -99,7 +99,7 @@ func TestUTXOIDLess(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			require.Equal(t, tt.expected, tt.id1.Less(&tt.id2))
+			require.Equal(t, tt.expected, tt.id1.Less(&tt.id2)) //nolint:gosec
 		})
 	}
 }

diff --git a/vms/platformvm/genesis/genesis.go b/vms/platformvm/genesis/genesis.go
@@ -59,7 +59,7 @@ func ParseState(genesisBytes []byte) (*State, error) {
 
 	utxos := make([]*avax.UTXO, 0, len(genesis.UTXOs))
 	for _, utxo := range genesis.UTXOs {
-		utxos = append(utxos, &utxo.UTXO)
+		utxos = append(utxos, &utxo.UTXO) //nolint:gosec
 	}
 
 	return &State{

diff --git a/vms/platformvm/service.go b/vms/platformvm/service.go
@@ -292,7 +292,7 @@ utxoFor:
 			continue utxoFor
 		}
 
-		response.UTXOIDs = append(response.UTXOIDs, &utxo.UTXOID)
+		response.UTXOIDs = append(response.UTXOIDs, &utxo.UTXOID) //nolint:gosec
 	}
 
 	balances := maps.Clone(lockedStakeables)

diff --git a/vms/platformvm/txs/executor/standard_tx_executor.go b/vms/platformvm/txs/executor/standard_tx_executor.go
@@ -154,7 +154,7 @@ func (e *StandardTxExecutor) ImportTx(tx *txs.ImportTx) error {
 		for index, input := range tx.Ins {
 			utxo, err := e.State.GetUTXO(input.InputID())
 			if err != nil {
-				return fmt.Errorf("failed to get UTXO %s: %w", &input.UTXOID, err)
+				return fmt.Errorf("failed to get UTXO %s: %w", &input.UTXOID, err) //nolint:gosec
 			}
 			utxos[index] = utxo
 		}

diff --git a/vms/platformvm/utxo/handler.go b/vms/platformvm/utxo/handler.go
@@ -443,7 +443,7 @@ func (h *handler) VerifySpend(
 		if err != nil {
 			return fmt.Errorf(
 				"failed to read consumed UTXO %s due to: %w",
-				&input.UTXOID,
+				&input.UTXOID, //nolint:gosec
 				err,
 			)
 		}

diff --git a/wallet/chain/x/builder.go b/wallet/chain/x/builder.go
@@ -655,7 +655,7 @@ func (b *builder) mintFTs(
 		// add the operation to the array
 		operations = append(operations, &txs.Operation{
 			Asset:   utxo.Asset,
-			UTXOIDs: []*avax.UTXOID{&utxo.UTXOID},
+			UTXOIDs: []*avax.UTXOID{&utxo.UTXOID}, //nolint:gosec
 			Op: &secp256k1fx.MintOperation{
 				MintInput: secp256k1fx.Input{
 					SigIndices: inputSigIndices,
@@ -717,7 +717,7 @@ func (b *builder) mintNFTs(
 		operations = append(operations, &txs.Operation{
 			Asset: avax.Asset{ID: assetID},
 			UTXOIDs: []*avax.UTXOID{
-				&utxo.UTXOID,
+				&utxo.UTXOID, //nolint:gosec
 			},
 			Op: &nftfx.MintOperation{
 				MintInput: secp256k1fx.Input{
@@ -773,7 +773,7 @@ func (b *builder) mintProperty(
 		operations = append(operations, &txs.Operation{
 			Asset: avax.Asset{ID: assetID},
 			UTXOIDs: []*avax.UTXOID{
-				&utxo.UTXOID,
+				&utxo.UTXOID, //nolint:gosec
 			},
 			Op: &propertyfx.MintOperation{
 				MintInput: secp256k1fx.Input{
@@ -829,7 +829,7 @@ func (b *builder) burnProperty(
 		operations = append(operations, &txs.Operation{
 			Asset: avax.Asset{ID: assetID},
 			UTXOIDs: []*avax.UTXOID{
-				&utxo.UTXOID,
+				&utxo.UTXOID, //nolint:gosec
 			},
 			Op: &propertyfx.BurnOperation{
 				Input: secp256k1fx.Input{