Bump golangci-lint (#557)

Supports and extracted from #486

Author: krebernisak

.github/workflows/pull-request-main.yml

@@ -16,11 +16,12 @@ jobs:
       actions: read
     steps:
       - name: Linting Go
-        uses: smartcontractkit/.github/actions/ci-lint-go@5ef875a78da521085ad768ecf2ed5e25009496f7 # ci-lint-go@2.0.0
+        uses: smartcontractkit/.github/actions/ci-lint-go@bd2ca3d8fa2dc89f98b49b297e9b72c2e3e68cdc # ci-lint-go@3.1.0
         with:
-          golangci-lint-version: v2.1.6
+          golangci-lint-version: v2.6.2
           use-go-cache: true
           only-new-issues: false
+          golangci-lint-config: .golangci.yml
 
   ci-lint-e2e:
     name: Lint E2E tests
@@ -31,12 +32,13 @@ jobs:
       actions: read
     steps:
       - name: Linting Go
-        uses: smartcontractkit/.github/actions/ci-lint-go@5ef875a78da521085ad768ecf2ed5e25009496f7 # ci-lint-go@2.0.0
+        uses: smartcontractkit/.github/actions/ci-lint-go@bd2ca3d8fa2dc89f98b49b297e9b72c2e3e68cdc # ci-lint-go@3.1.0
         with:
-          golangci-lint-version: v2.1.6
+          golangci-lint-version: v2.6.2
           golangci-lint-args: --build-tags="e2e"
           use-go-cache: true
           only-new-issues: false
+          golangci-lint-config: .golangci.yml
 
   ci-lint-misc:
     name: Lint GH Actions and scripts

.github/workflows/push-main.yml

@@ -15,11 +15,12 @@ jobs:
       actions: read
     steps:
       - name: Linting Go
-        uses: smartcontractkit/.github/actions/ci-lint-go@5ef875a78da521085ad768ecf2ed5e25009496f7 # ci-lint-go@2.0.0
+        uses: smartcontractkit/.github/actions/ci-lint-go@bd2ca3d8fa2dc89f98b49b297e9b72c2e3e68cdc # ci-lint-go@3.1.0
         with:
-          golangci-lint-version: v2.1.6
+          golangci-lint-version: v2.6.2
           use-go-cache: true
           only-new-issues: false
+          golangci-lint-config: .golangci.yml
 
   ci-lint-e2e:
     name: Lint E2E tests
@@ -30,12 +31,13 @@ jobs:
       actions: read
     steps:
       - name: Linting Go
-        uses: smartcontractkit/.github/actions/ci-lint-go@5ef875a78da521085ad768ecf2ed5e25009496f7 # ci-lint-go@2.0.0
+        uses: smartcontractkit/.github/actions/ci-lint-go@bd2ca3d8fa2dc89f98b49b297e9b72c2e3e68cdc # ci-lint-go@3.1.0
         with:
-          golangci-lint-version: v2.1.6
+          golangci-lint-version: v2.6.2
           golangci-lint-args: --build-tags="e2e"
           use-go-cache: true
           only-new-issues: false
+          golangci-lint-config: .golangci.yml
 
   ci-lint-misc:
     name: Lint GH Actions and scripts

.github/workflows/push-tag-release.yml

@@ -14,9 +14,10 @@ jobs:
       actions: read
     steps:
       - name: ci-lint
-        uses: smartcontractkit/.github/actions/ci-lint-go@5ef875a78da521085ad768ecf2ed5e25009496f7 # ci-lint-go@2.0.0
+        uses: smartcontractkit/.github/actions/ci-lint-go@bd2ca3d8fa2dc89f98b49b297e9b72c2e3e68cdc # ci-lint-go@3.1.0
         with:
-          golangci-lint-version: v2.1.6
+          golangci-lint-version: v2.6.2
+          golangci-lint-config: .golangci.yml
 
   ci-lint-e2e:
     name: Lint E2E tests
@@ -27,10 +28,11 @@ jobs:
       actions: read
     steps:
       - name: Linting Go
-        uses: smartcontractkit/.github/actions/ci-lint-go@5ef875a78da521085ad768ecf2ed5e25009496f7 # ci-lint-go@2.0.0
+        uses: smartcontractkit/.github/actions/ci-lint-go@bd2ca3d8fa2dc89f98b49b297e9b72c2e3e68cdc # ci-lint-go@3.1.0
         with:
-          golangci-lint-version: v2.1.6
+          golangci-lint-version: v2.6.2
           golangci-lint-args: --build-tags="e2e"
+          golangci-lint-config: .golangci.yml
 
   ci-test:
     runs-on: ubuntu-latest

.golangci.yml

@@ -42,6 +42,9 @@ linters:
   settings:
     goconst:
       min-len: 5
+    gomoddirectives:
+      replace-allow-list:
+        - github.com/gogo/protobuf
     govet:
       enable:
         - shadow

builder_timelock_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/smartcontractkit/mcms/types"
 )
 
-func TestTimelockProposalBuilder(t *testing.T) {
+func TestTimelockProposal_Builder(t *testing.T) {
 	t.Parallel()
 
 	// Define a fixed validUntil timestamp for consistency

e2e/ledger/ledger_test.go

@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 package ledger
 
@@ -10,16 +9,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/accounts"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/usbwallet"
-	"github.com/ethereum/go-ethereum/common"
-	gethTypes "github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/gagliardetto/solana-go"
-	cselectors "github.com/smartcontractkit/chain-selectors"
 	"github.com/stretchr/testify/suite"
 
+	cselectors "github.com/smartcontractkit/chain-selectors"
+
 	"github.com/smartcontractkit/mcms"
 	e2e "github.com/smartcontractkit/mcms/e2e/tests"
 	solanae2e "github.com/smartcontractkit/mcms/e2e/tests/solana"
@@ -29,6 +22,15 @@ import (
 	"github.com/smartcontractkit/mcms/sdk/evm/bindings"
 	solanamcms "github.com/smartcontractkit/mcms/sdk/solana"
 	"github.com/smartcontractkit/mcms/types"
+
+	"github.com/ethereum/go-ethereum/accounts"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/accounts/usbwallet"
+	"github.com/ethereum/go-ethereum/common"
+	gethTypes "github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
+
+	"github.com/gagliardetto/solana-go"
 )
 
 func TestManualLedgerSigningSuite(t *testing.T) {

e2e/tests/aptos/common.go

@@ -5,20 +5,23 @@ package aptos
 import (
 	"time"
 
-	"github.com/aptos-labs/aptos-go-sdk"
-	"github.com/aptos-labs/aptos-go-sdk/crypto"
 	"github.com/stretchr/testify/suite"
 
 	cselectors "github.com/smartcontractkit/chain-selectors"
+
+	"github.com/smartcontractkit/chainlink-testing-framework/framework/components/blockchain"
+
+	"github.com/aptos-labs/aptos-go-sdk"
+	"github.com/aptos-labs/aptos-go-sdk/crypto"
+
 	"github.com/smartcontractkit/chainlink-aptos/bindings/mcms"
 	mcmstest "github.com/smartcontractkit/chainlink-aptos/bindings/mcms_test"
-	"github.com/smartcontractkit/chainlink-testing-framework/framework/components/blockchain"
 
 	e2e "github.com/smartcontractkit/mcms/e2e/tests"
 	"github.com/smartcontractkit/mcms/types"
 )
 
-type AptosTestSuite struct {
+type TestSuite struct {
 	suite.Suite
 	e2e.TestSetup
 
@@ -29,7 +32,7 @@ type AptosTestSuite struct {
 	MCMSTestContract mcmstest.MCMSTest
 }
 
-func (a *AptosTestSuite) SetupSuite() {
+func (a *TestSuite) SetupSuite() {
 	a.TestSetup = *e2e.InitializeSharedTestSetup(a.T())
 	details, err := cselectors.GetChainDetailsByChainIDAndFamily(a.AptosChain.ChainID, cselectors.FamilyAptos)
 	a.Require().NoError(err)
@@ -46,7 +49,7 @@ func (a *AptosTestSuite) SetupSuite() {
 	a.Require().NoError(err)
 }
 
-func (a *AptosTestSuite) deployMCMSContract() {
+func (a *TestSuite) deployMCMSContract() {
 	mcmsSeed := mcms.DefaultSeed + time.Now().String()
 	addr, tx, mcmsContract, err := mcms.DeployToResourceAccount(a.deployerAccount, a.AptosRPCClient, mcmsSeed)
 	a.Require().NoError(err)
@@ -57,7 +60,7 @@ func (a *AptosTestSuite) deployMCMSContract() {
 	a.MCMSContract = mcmsContract
 }
 
-func (a *AptosTestSuite) deployMCMSTestContract() {
+func (a *TestSuite) deployMCMSTestContract() {
 	if a.MCMSContract == nil {
 		a.T().Fatal("MCMS contract not found. Can only deploy MCMS user contract after MCMS contract has been deployed.")
 	}

e2e/tests/aptos/set_config.go

@@ -13,7 +13,7 @@ import (
 	"github.com/smartcontractkit/mcms/types"
 )
 
-func (a *AptosTestSuite) Test_Aptos_SetConfig() {
+func (a *TestSuite) TestSetConfig() {
 	/*
 		This tests setting and retrieving the config for all three timelock roles:
 		- Bypasser

e2e/tests/aptos/timelock_cancel.go

@@ -8,17 +8,19 @@ import (
 	"slices"
 	"time"
 
+	"github.com/smartcontractkit/mcms"
+	"github.com/smartcontractkit/mcms/sdk"
+	"github.com/smartcontractkit/mcms/types"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+
 	"github.com/smartcontractkit/chainlink-aptos/bindings/bind"
 
-	"github.com/smartcontractkit/mcms"
-	"github.com/smartcontractkit/mcms/sdk"
 	aptossdk "github.com/smartcontractkit/mcms/sdk/aptos"
-	"github.com/smartcontractkit/mcms/types"
 )
 
-func (a *AptosTestSuite) Test_Aptos_TimelockCancel() {
+func (a *TestSuite) TestTimelock_Cancel() {
 	/*
 		This tests that a timelock proposal scheduled by the Proposer MCM can be cancelled by the
 		Canceller MCM.
@@ -192,7 +194,7 @@ func (a *AptosTestSuite) Test_Aptos_TimelockCancel() {
 	var opCount uint64
 	opCount, err = proposerInspector.GetOpCount(a.T().Context(), mcmsAddress.StringLong())
 	a.Require().NoError(err)
-	a.Require().EqualValues(opCount, 1)
+	a.Require().EqualValues(1, opCount)
 
 	timelockExecutor := aptossdk.NewTimelockExecutor(a.AptosRPCClient, a.deployerAccount)
 	timelockExecutors := map[types.ChainSelector]sdk.TimelockExecutor{

e2e/tests/aptos/timelock_proposal.go

@@ -9,21 +9,25 @@ import (
 	"slices"
 	"time"
 
-	"github.com/aptos-labs/aptos-go-sdk/api"
+	"github.com/stretchr/testify/assert"
+
+	"github.com/smartcontractkit/mcms"
+	"github.com/smartcontractkit/mcms/sdk"
+	"github.com/smartcontractkit/mcms/types"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+
+	"github.com/aptos-labs/aptos-go-sdk/api"
+
 	"github.com/smartcontractkit/chainlink-aptos/bindings/bind"
 	module_mcms_user "github.com/smartcontractkit/chainlink-aptos/bindings/mcms_test/mcms_user"
 	"github.com/smartcontractkit/chainlink-aptos/relayer/codec"
-	"github.com/stretchr/testify/assert"
 
-	"github.com/smartcontractkit/mcms"
-	"github.com/smartcontractkit/mcms/sdk"
 	aptossdk "github.com/smartcontractkit/mcms/sdk/aptos"
-	"github.com/smartcontractkit/mcms/types"
 )
 
-func (a *AptosTestSuite) Test_Aptos_TimelockProposal() {
+func (a *TestSuite) TestTimelockProposal() {
 	/*
 		This tests that both the Proposers and the Bypassers can successfully perform operations
 		via the timelock.
@@ -286,6 +290,7 @@ func (a *AptosTestSuite) Test_Aptos_TimelockProposal() {
 
 		startingOpCount, errr := inspector.GetOpCount(a.T().Context(), mcmsAddress.StringLong())
 		a.Require().NoError(errr)
+
 		validUntil := uint32(time.Now().Add(time.Hour * 24).Unix())
 		mcmsTestProposalBuilder := mcms.NewTimelockProposalBuilder().
 			SetVersion("v1").