chore: bump linter (cosmos#25537)

aljo242 · beer-1 · commit 1b478c961739 · 2025-11-04T13:32:30.000+09:00
diff --git a/Makefile b/Makefile
@@ -379,7 +379,7 @@ benchmark:
 ###                                Linting                                  ###
 ###############################################################################
 
-golangci_version=v2.5.0
+golangci_version=v2.6.0
 
 lint-install:
 	@echo "--> Installing golangci-lint $(golangci_version)"
diff --git a/client/context.go b/client/context.go
@@ -348,6 +348,7 @@ func (ctx Context) PrintProto(toPrint proto.Message) error {
 
 // PrintObjectLegacy is a variant of PrintProto that doesn't require a proto.Message type
 // and uses amino JSON encoding.
+//
 // Deprecated: It will be removed in the near future!
 func (ctx Context) PrintObjectLegacy(toPrint any) error {
 	out, err := ctx.LegacyAmino.MarshalJSON(toPrint)
diff --git a/client/keys/add_ledger_test.go b/client/keys/add_ledger_test.go
@@ -1,5 +1,4 @@
 //go:build ledger || test_ledger_mock
-// +build ledger test_ledger_mock
 
 package keys
 
diff --git a/codec/proto_codec.go b/codec/proto_codec.go
@@ -23,6 +23,7 @@ import (
 
 // ProtoCodecMarshaler defines an interface for codecs that utilize Protobuf for both
 // binary and JSON encoding.
+//
 // Deprecated: Use Codec instead.
 type ProtoCodecMarshaler interface {
 	Codec
diff --git a/crypto/keyring/keyring_ledger_test.go b/crypto/keyring/keyring_ledger_test.go
@@ -1,5 +1,4 @@
 //go:build ledger || test_ledger_mock
-// +build ledger test_ledger_mock
 
 package keyring
 
diff --git a/crypto/keyring/keyring_linux.go b/crypto/keyring/keyring_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package keyring
 
diff --git a/crypto/keyring/keyring_linux_test.go b/crypto/keyring/keyring_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package keyring
 
diff --git a/crypto/keyring/keyring_other.go b/crypto/keyring/keyring_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package keyring
 
diff --git a/crypto/keys/secp256k1/secp256k1_cgo.go b/crypto/keys/secp256k1/secp256k1_cgo.go
@@ -1,5 +1,4 @@
 //go:build libsecp256k1_sdk
-// +build libsecp256k1_sdk
 
 package secp256k1
 
diff --git a/crypto/keys/secp256k1/secp256k1_cgo_test.go b/crypto/keys/secp256k1/secp256k1_cgo_test.go
@@ -1,5 +1,4 @@
 //go:build libsecp256k1_sdk
-// +build libsecp256k1_sdk
 
 package secp256k1
 
diff --git a/crypto/keys/secp256k1/secp256k1_nocgo.go b/crypto/keys/secp256k1/secp256k1_nocgo.go
@@ -1,5 +1,4 @@
 //go:build !libsecp256k1_sdk
-// +build !libsecp256k1_sdk
 
 package secp256k1
 
diff --git a/crypto/keys/secp256k1/secp256k1_nocgo_test.go b/crypto/keys/secp256k1/secp256k1_nocgo_test.go
@@ -1,5 +1,4 @@
 //go:build !libsecp256k1_sdk
-// +build !libsecp256k1_sdk
 
 package secp256k1
 
diff --git a/crypto/ledger/ledger_mock.go b/crypto/ledger/ledger_mock.go
@@ -1,5 +1,4 @@
 //go:build ledger && test_ledger_mock
-// +build ledger,test_ledger_mock
 
 package ledger
 
diff --git a/crypto/ledger/ledger_notavail.go b/crypto/ledger/ledger_notavail.go
@@ -1,5 +1,4 @@
 //go:build !cgo || !ledger
-// +build !cgo !ledger
 
 // test_ledger_mock
 
diff --git a/crypto/ledger/ledger_real.go b/crypto/ledger/ledger_real.go
@@ -1,5 +1,4 @@
 //go:build cgo && ledger && !test_ledger_mock
-// +build cgo,ledger,!test_ledger_mock
 
 package ledger
 
diff --git a/crypto/ledger/ledger_test.go b/crypto/ledger/ledger_test.go
@@ -1,5 +1,4 @@
 //go:build ledger
-// +build ledger
 
 package ledger
 
diff --git a/math/int_internal_test.go b/math/int_internal_test.go
@@ -121,7 +121,7 @@ func (s *internalIntTestSuite) TestImmutabilityArithInt() {
 		bi := new(big.Int).SetInt64(n)
 
 		for j := 0; j < size; j++ {
-			op := ops[rand.Intn(len(ops))]
+			op := ops[rand.Intn(len(ops))] //nolint:gosec // testing
 			uis[j], bis[j] = op(ui, bi)
 		}
 
diff --git a/math/legacy_dec.go b/math/legacy_dec.go
@@ -22,6 +22,7 @@ const (
 
 	// LegacyDecimalPrecisionBits bits required to represent the above precision
 	// Ceiling[Log2[10^Precision - 1]]
+	//
 	// Deprecated: This is unused and will be removed
 	LegacyDecimalPrecisionBits = 60
 
diff --git a/runtime/app.go b/runtime/app.go
@@ -62,7 +62,7 @@ type App struct {
 // RegisterModules registers the provided modules with the module manager and
 // the basic module manager. This is the primary hook for integrating with
 // modules which are not registered using the app config.
-func (a *App) RegisterModules(modules ...module.AppModule) error {
+func (a *App) RegisterModules(modules ...module.AppModule) error { //nolint:staticcheck // needed for legacy compatibility
 	for _, appModule := range modules {
 		name := appModule.Name()
 		if _, ok := a.ModuleManager.Modules[name]; ok {
diff --git a/server/api/server.go b/server/api/server.go
@@ -11,7 +11,7 @@ import (
 
 	cmtrpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server"
 	gateway "github.com/cosmos/gogogateway"
-	"github.com/golang/protobuf/proto" //nolint:staticcheck // keep for compat
+	"github.com/golang/protobuf/proto" //nolint:staticcheck // needed for compatibility
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
diff --git a/server/api/server_test.go b/server/api/server_test.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/protobuf/proto" //nolint:staticcheck // keep for compat
+	"github.com/golang/protobuf/proto" //nolint:staticcheck // needed for testing
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"google.golang.org/grpc/codes"
diff --git a/simapp/params/amino.go b/simapp/params/amino.go
@@ -1,5 +1,4 @@
 //go:build test_amino
-// +build test_amino
 
 package params
 
diff --git a/simapp/params/proto.go b/simapp/params/proto.go
@@ -1,5 +1,4 @@
 //go:build !test_amino
-// +build !test_amino
 
 package params
 
diff --git a/store/cachekv/store_test.go b/store/cachekv/store_test.go
@@ -475,18 +475,18 @@ func doOp(t *testing.T, st types.CacheKVStore, truth dbm.DB, op int, args ...int
 		require.NoError(t, err)
 	case opSetRange:
 		require.True(t, len(args) > 1)
-		start := args[0]
-		end := args[1] //nolint:gosec // this is not out of range
+		start := args[0] //nolint:gosec // this is not out of range
+		end := args[1]   //nolint:gosec // this is not out of range
 		setRange(t, st, truth, start, end)
 	case opDel:
-		k := args[0]
+		k := args[0] //nolint:gosec // this is not out of range
 		st.Delete(keyFmt(k))
 		err := truth.Delete(keyFmt(k))
 		require.NoError(t, err)
 	case opDelRange:
 		require.True(t, len(args) > 1)
-		start := args[0]
-		end := args[1] //nolint:gosec // this is not out of range
+		start := args[0] //nolint:gosec // this is not out of range
+		end := args[1]   //nolint:gosec // this is not out of range
 		deleteRange(t, st, truth, start, end)
 	case opWrite:
 		st.Write()
diff --git a/tests/e2e/auth/cli_test.go b/tests/e2e/auth/cli_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 package auth
 
diff --git a/tests/e2e/authz/cli_test.go b/tests/e2e/authz/cli_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 package authz
 
diff --git a/tests/e2e/bank/cli_test.go b/tests/e2e/bank/cli_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 package client
 
diff --git a/tests/e2e/client/grpc/cmtservice/service_test.go b/tests/e2e/client/grpc/cmtservice/service_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 package cmtservice_test
 
diff --git a/tests/e2e/distribution/cli_test.go b/tests/e2e/distribution/cli_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 package distribution
 
diff --git a/tests/e2e/gov/cli_test.go b/tests/e2e/gov/cli_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 package gov
 
diff --git a/tests/e2e/gov/tx.go b/tests/e2e/gov/tx.go
@@ -260,7 +260,7 @@ func (s *E2ETestSuite) TestNewCmdSubmitLegacyProposal() {
 
 	for _, tc := range testCases {
 		s.Run(tc.name, func() {
-			cmd := cli.NewCmdSubmitLegacyProposal()
+			cmd := cli.NewCmdSubmitLegacyProposal() //nolint:staticcheck // needed for legacy testing
 			clientCtx := val.ClientCtx
 
 			out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, tc.args)
diff --git a/tests/e2e/mint/cli_test.go b/tests/e2e/mint/cli_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 package mint
 
diff --git a/tests/e2e/server/export_test.go b/tests/e2e/server/export_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 package server_test
 
diff --git a/tests/e2e/staking/cli_test.go b/tests/e2e/staking/cli_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 package testutil
 
diff --git a/tests/e2e/tx/service_test.go b/tests/e2e/tx/service_test.go
@@ -1144,13 +1144,15 @@ func (s *E2ETestSuite) mkTxBuilder() client.TxBuilder {
 
 // protoTxProvider is a type which can provide a proto transaction. It is a
 // workaround to get access to the wrapper TxBuilder's method GetProtoTx().
+//
 // Deprecated: It's only used for testing the deprecated Simulate gRPC endpoint
 // using a proto Tx field.
 type protoTxProvider interface {
 	GetProtoTx() *tx.Tx
 }
 
 // txBuilderToProtoTx converts a txBuilder into a proto tx.Tx.
+//
 // Deprecated: It's used for testing the deprecated Simulate gRPC endpoint
 // using a proto Tx field and for testing the TxEncode endpoint.
 func txBuilderToProtoTx(txBuilder client.TxBuilder) (*tx.Tx, error) {
diff --git a/tests/integration/tx/aminojson/aminojson_test.go b/tests/integration/tx/aminojson/aminojson_test.go
@@ -162,7 +162,7 @@ func TestAminoJSON_Equivalence(t *testing.T) {
 				signBz, err := handler.GetSignBytes(context.Background(), signerData, txData)
 				require.NoError(t, err)
 
-				legacyHandler := tx.NewSignModeLegacyAminoJSONHandler()
+				legacyHandler := tx.NewSignModeLegacyAminoJSONHandler() //nolint:staticcheck // needed for legacy testing
 				txBuilder := encCfg.TxConfig.NewTxBuilder()
 				require.NoError(t, txBuilder.SetMsgs([]types.Msg{tt.Gogo}...))
 				txBuilder.SetMemo(handlerOptions.Memo)
@@ -457,7 +457,7 @@ func TestAminoJSON_LegacyParity(t *testing.T) {
 			require.Equal(t, string(gogoBytes), string(newGogoBytes))
 
 			// test amino json signer handler equivalence
-			msg, ok := tc.gogo.(legacytx.LegacyMsg)
+			msg, ok := tc.gogo.(legacytx.LegacyMsg) //nolint:staticcheck // needed for legacy testing
 			if !ok {
 				// not signable
 				return
@@ -482,7 +482,7 @@ func TestAminoJSON_LegacyParity(t *testing.T) {
 			signBz, err := handler.GetSignBytes(context.Background(), signerData, txData)
 			require.NoError(t, err)
 
-			legacyHandler := tx.NewSignModeLegacyAminoJSONHandler()
+			legacyHandler := tx.NewSignModeLegacyAminoJSONHandler() //nolint:staticcheck // needed for legacy testing
 			txBuilder := encCfg.TxConfig.NewTxBuilder()
 			require.NoError(t, txBuilder.SetMsgs([]types.Msg{msg}...))
 			txBuilder.SetMemo(handlerOptions.Memo)
diff --git a/testutil/sims/simulation_helpers.go b/testutil/sims/simulation_helpers.go
@@ -52,6 +52,7 @@ func SetupSimulation(config simtypes.Config, dirPrefix, dbName string, verbose,
 
 // SimulationOperations retrieves the simulation params from the provided file path
 // and returns all the modules weighted operations
+//
 // Deprecated: use BuildSimulationOperations with TxConfig
 func SimulationOperations(app runtime.AppI, cdc codec.JSONCodec, config simtypes.Config) []simtypes.WeightedOperation {
 	return BuildSimulationOperations(app, cdc, config, moduletestutil.MakeTestTxConfig())
diff --git a/testutil/x/counter/module.go b/testutil/x/counter/module.go
@@ -38,6 +38,7 @@ func NewAppModule(keeper *keeper.Keeper) AppModule {
 func (AppModule) ConsensusVersion() uint64 { return 1 }
 
 // Name returns the module's name.
+//
 // Deprecated: kept for legacy reasons.
 func (AppModule) Name() string { return types.ModuleName }
 
diff --git a/types/coin.go b/types/coin.go
@@ -109,6 +109,7 @@ func (coin Coin) IsLTE(other Coin) bool {
 }
 
 // IsEqual returns true if the two sets of Coins have the same value
+//
 // Deprecated: Use Coin.Equal instead.
 func (coin Coin) IsEqual(other Coin) bool {
 	return coin.Equal(other)
@@ -700,6 +701,7 @@ func (coins Coins) AmountOf(denom string) math.Int {
 
 // AmountOfNoDenomValidation returns the amount of a denom from coins
 // without validating the denomination.
+//
 // Deprecated: use AmountOf
 func (coins Coins) AmountOfNoDenomValidation(denom string) math.Int {
 	return coins.AmountOf(denom)
diff --git a/types/collections.go b/types/collections.go
@@ -39,6 +39,7 @@ var (
 	LegacyDecValue collcodec.ValueCodec[math.LegacyDec] = legacyDecValueCodec{}
 
 	// TimeKey represents a collections.KeyCodec to work with time.Time
+	//
 	// Deprecated: exists only for state compatibility reasons, should not
 	// be used for new storage keys using time. Please use the time KeyCodec
 	// provided in the collections package.
diff --git a/types/dec_coin.go b/types/dec_coin.go
@@ -82,6 +82,7 @@ func (coin DecCoin) IsLT(other DecCoin) bool {
 }
 
 // IsEqual returns true if the two sets of Coins have the same value.
+//
 // Deprecated: Use DecCoin.Equal instead.
 func (coin DecCoin) IsEqual(other DecCoin) bool {
 	return coin.Equal(other)
diff --git a/types/module/module.go b/types/module/module.go
@@ -198,6 +198,7 @@ type HasABCIGenesis interface {
 
 // AppModule is the form for an application module. Most of
 // its functionality has been moved to extension interfaces.
+//
 // Deprecated: use appmodule.AppModule with a combination of extension interfaces instead.
 type AppModule interface {
 	appmodule.AppModule
@@ -229,6 +230,7 @@ type HasConsensusVersion interface {
 }
 
 // HasABCIEndblock is a released typo of HasABCIEndBlock.
+//
 // Deprecated: use HasABCIEndBlock instead.
 type HasABCIEndblock HasABCIEndBlock
 
diff --git a/types/result_test.go b/types/result_test.go
@@ -11,7 +11,7 @@ import (
 	cmtt "github.com/cometbft/cometbft/proto/tendermint/types"
 	coretypes "github.com/cometbft/cometbft/rpc/core/types"
 	cmt "github.com/cometbft/cometbft/types"
-	"github.com/golang/protobuf/proto" //nolint:staticcheck // keep for compat
+	"github.com/golang/protobuf/proto" //nolint:staticcheck // needed for testing
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
diff --git a/x/auth/migrations/legacytx/stdsign.go b/x/auth/migrations/legacytx/stdsign.go
@@ -19,6 +19,7 @@ import (
 
 // LegacyMsg defines the old interface a message must fulfill,
 // containing Amino signing method.
+//
 // Deprecated: Please use `Msg` instead.
 type LegacyMsg interface {
 	sdk.Msg
@@ -59,6 +60,7 @@ func mustSortJSON(bz []byte) []byte {
 }
 
 // StdSignBytes returns the bytes to sign for a transaction.
+//
 // Deprecated: Please use x/tx/signing/aminojson instead.
 func StdSignBytes(chainID string, accnum, sequence, timeout uint64, fee StdFee, msgs []sdk.Msg, memo string) []byte {
 	if RegressionTestingAminoCodec == nil {
diff --git a/x/auth/tx/legacy_amino_json.go b/x/auth/tx/legacy_amino_json.go
@@ -22,6 +22,7 @@ type signModeLegacyAminoJSONHandler struct{}
 
 // NewSignModeLegacyAminoJSONHandler returns a new signModeLegacyAminoJSONHandler.
 // Note: The public constructor is only used for testing.
+//
 // Deprecated: Please use x/tx/signing/aminojson instead.
 func NewSignModeLegacyAminoJSONHandler() signing.SignModeHandler {
 	return signModeLegacyAminoJSONHandler{}
diff --git a/x/auth/tx/legacy_amino_json_test.go b/x/auth/tx/legacy_amino_json_test.go
diff --git a/x/auth/tx/service.go b/x/auth/tx/service.go
diff --git a/x/authz/msgs_test.go b/x/authz/msgs_test.go
diff --git a/x/bank/keeper/grpc_query_test.go b/x/bank/keeper/grpc_query_test.go
diff --git a/x/bank/types/params_legacy.go b/x/bank/types/params_legacy.go
diff --git a/x/epochs/module.go b/x/epochs/module.go
diff --git a/x/feegrant/client/cli/tx_test.go b/x/feegrant/client/cli/tx_test.go
diff --git a/x/feegrant/msgs_test.go b/x/feegrant/msgs_test.go
diff --git a/x/genutil/client/cli/commands.go b/x/genutil/client/cli/commands.go
diff --git a/x/gov/client/cli/prompt_test.go b/x/gov/client/cli/prompt_test.go
diff --git a/x/gov/client/cli/tx.go b/x/gov/client/cli/tx.go
diff --git a/x/gov/client/cli/util.go b/x/gov/client/cli/util.go
diff --git a/x/gov/client/utils/query.go b/x/gov/client/utils/query.go
diff --git a/x/gov/keeper/keeper.go b/x/gov/keeper/keeper.go
diff --git a/x/gov/simulation/operations.go b/x/gov/simulation/operations.go
diff --git a/x/mint/types/minter_test.go b/x/mint/types/minter_test.go
diff --git a/x/protocolpool/module.go b/x/protocolpool/module.go
diff --git a/x/staking/types/msg_test.go b/x/staking/types/msg_test.go
diff --git a/x/upgrade/client/cli/tx.go b/x/upgrade/client/cli/tx.go
diff --git a/x/upgrade/types/proposal.go b/x/upgrade/types/proposal.go

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build ledger \|\| test_ledger_mock`
`2`		`-// +build ledger test_ledger_mock`
`3`	`2`
`4`	`3`	`package keys`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build linux`
`2`		`-// +build linux`
`3`	`2`
`4`	`3`	`package keyring`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !linux`
`2`		`-// +build !linux`
`3`	`2`
`4`	`3`	`package keyring`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build libsecp256k1_sdk`
`2`		`-// +build libsecp256k1_sdk`
`3`	`2`
`4`	`3`	`package secp256k1`
`5`	`4`