chore: lint v2 (#24118)

Author: aljo242

.golangci.yml

@@ -1,126 +1,144 @@
+version: "2"
 run:
-  tests: true
-  timeout: 15m
-  allow-parallel-runners: true
   build-tags:
     - e2e
     - ledger
     - test_ledger_mock
     - sims
-
+  tests: true
+  allow-parallel-runners: true
 linters:
-  disable-all: true
+  default: none
   enable:
+    - copyloopvar
     - dogsled
     - errcheck
     - errorlint
-    - copyloopvar
-    - gci
     - goconst
     - gocritic
-    - gofumpt
     - gosec
-    - gosimple
     - govet
     - ineffassign
     - misspell
     - nakedret
     - nolintlint
     - revive
     - staticcheck
-    - stylecheck
     - thelper
-    - typecheck
     - unconvert
     - unused
-
+  settings:
+    dogsled:
+      max-blank-identifiers: 6
+    gocritic:
+      disabled-checks:
+        - regexpMust
+        - appendAssign
+        - ifElseChain
+    gosec:
+      excludes:
+        - G101
+        - G107
+        - G404
+      confidence: medium
+    misspell:
+      locale: US
+    nolintlint:
+      require-explanation: true
+      require-specific: false
+      allow-unused: false
+    revive:
+      rules:
+        - name: redefines-builtin-id
+          disabled: true
+    staticcheck:
+      checks:
+        - all
+    unused:
+      local-variables-are-used: false
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - staticcheck
+        text: 'ST1003:'
+      - linters:
+          - staticcheck
+        text: 'ST1016:'
+      - linters:
+          - staticcheck
+        path: migrations
+        text: 'SA1019:'
+      - linters:
+          - staticcheck
+        text: 'SA1019: codec.NewAminoCodec is deprecated'
+      - linters:
+          - staticcheck
+        text: 'SA1019: legacybech32.MustMarshalPubKey'
+      - linters:
+          - staticcheck
+        text: 'SA1019: legacybech32.MarshalPubKey'
+      - linters:
+          - staticcheck
+        text: 'SA1019: legacybech32.UnmarshalPubKey'
+      - linters:
+          - staticcheck
+        text: 'SA1019: params.SendEnabled is deprecated'
+      - linters:
+          - gosec
+        text: 'G115: integer overflow conversion'
+      - linters:
+          - nolintlint
+        text: leading space
+    paths:
+      - server/grpc/gogoreflection/fix_registration.go
+      - fix_registration.go
+      - .*\.pb\.go$
+      - .*\.pb\.gw\.go$
+      - .*\.pulsar\.go$
+      - crypto/keys/secp256k1/internal/*
+      - types/coin_regex.go
+      - testutil/testdata
+      - x/params
+      - x/crisis
+      - third_party$
+      - builtin$
+      - examples$
 issues:
-  exclude-dirs:
-    - testutil/testdata
-    - x/params
-    - x/crisis
-  exclude-files:
-    - server/grpc/gogoreflection/fix_registration.go
-    - "fix_registration.go"
-    - ".*\\.pb\\.go$"
-    - ".*\\.pb\\.gw\\.go$"
-    - ".*\\.pulsar\\.go$"
-    - crypto/keys/secp256k1/internal/*
-    - types/coin_regex.go
-  exclude-rules:
-    - text: "ST1003:" # We are fine with our current naming
-      linters:
-        - stylecheck
-    # FIXME: Disabled until golangci-lint updates stylecheck with this fix:
-    # https://github.com/dominikh/go-tools/issues/389
-    - text: "ST1016:" # Ok with inconsistent receiver names
-      linters:
-        - stylecheck
-    - path: "migrations" # migraitions always use deprecated code
-      text: "SA1019:"
-      linters:
-        - staticcheck
-    - text: "SA1019: codec.NewAminoCodec is deprecated" # TODO remove once migration path is set out
-      linters:
-        - staticcheck
-    - text: "SA1019: legacybech32.MustMarshalPubKey" # TODO remove once ready to remove from the sdk
-      linters:
-        - staticcheck
-    - text: "SA1019: legacybech32.MarshalPubKey" # TODO remove once ready to remove from the sdk
-      linters:
-        - staticcheck
-    - text: "SA1019: legacybech32.UnmarshalPubKey" # TODO remove once ready to remove from the sdk
-      linters:
-        - staticcheck
-    - text: "SA1019: params.SendEnabled is deprecated" # TODO remove once ready to remove from the sdk
-      linters:
-        - staticcheck
-    - text: "G115: integer overflow conversion" # We are doing this everywhere.
-      linters:
-        - gosec
-    - text: "leading space"
-      linters:
-        - nolintlint
   max-issues-per-linter: 10000
   max-same-issues: 10000
-
-linters-settings:
-  gci:
-    custom-order: true
-    sections:
-      - standard # Standard section: captures all standard packages.
-      - default # Default section: contains all imports that could not be matched to another section type.
-      - prefix(cosmossdk.io)
-      - prefix(github.com/cosmos/cosmos-sdk)
-  revive:
-    rules:
-      - name: redefines-builtin-id
-        disabled: true
-
-  gosec:
-    # Available rules: https://github.com/securego/gosec#available-rules
-    excludes:
-      - G101 # Potential hardcoded credentials
-      - G107 # Potential HTTP request made with variable url
-      - G404 # Use of weak random number generator (math/rand instead of crypto/rand)
-    exclude-generated: true
-    confidence: medium
-  misspell:
-    locale: US
-  gofumpt:
-    extra-rules: true
-  dogsled:
-    max-blank-identifiers: 6
-  nolintlint:
-    allow-unused: false
-    require-explanation: true
-    require-specific: false
-  gosimple:
-    checks: ["all"]
-  gocritic:
-    disabled-checks:
-      - regexpMust
-      - appendAssign
-      - ifElseChain
-  unused:
-    local-variables-are-used: false
+formatters:
+  enable:
+    - gci
+    - gofumpt
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(cosmossdk.io)
+        - prefix(github.com/cosmos/cosmos-sdk)
+      custom-order: true
+    gofumpt:
+      extra-rules: true
+  exclusions:
+    generated: lax
+    paths:
+      - server/grpc/gogoreflection/fix_registration.go
+      - fix_registration.go
+      - .*\.pb\.go$
+      - .*\.pb\.gw\.go$
+      - .*\.pulsar\.go$
+      - crypto/keys/secp256k1/internal/*
+      - types/coin_regex.go
+      - testutil/testdata
+      - x/params
+      - x/crisis
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -382,11 +382,11 @@ benchmark:
 ###                                Linting                                  ###
 ###############################################################################
 
-golangci_version=v1.64.8
+golangci_version=v2.0.0
 
 lint-install:
 	@echo "--> Installing golangci-lint $(golangci_version)"
-	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
+	@go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(golangci_version)
 
 lint:
 	@echo "--> Running linter on all files"

baseapp/abci.go

@@ -340,11 +340,11 @@ func (app *BaseApp) ApplySnapshotChunk(req *abci.RequestApplySnapshotChunk) (*ab
 func (app *BaseApp) CheckTx(req *abci.RequestCheckTx) (*abci.ResponseCheckTx, error) {
 	var mode execMode
 
-	switch {
-	case req.Type == abci.CheckTxType_New:
+	switch req.Type {
+	case abci.CheckTxType_New:
 		mode = execModeCheck
 
-	case req.Type == abci.CheckTxType_Recheck:
+	case abci.CheckTxType_Recheck:
 		mode = execModeReCheck
 
 	default:

baseapp/baseapp.go

@@ -937,12 +937,13 @@ func (app *BaseApp) runTx(mode execMode, txBytes []byte) (gInfo sdk.GasInfo, res
 		anteEvents = events.ToABCIEvents()
 	}
 
-	if mode == execModeCheck {
+	switch mode {
+	case execModeCheck:
 		err = app.mempool.Insert(ctx, tx)
 		if err != nil {
 			return gInfo, nil, anteEvents, err
 		}
-	} else if mode == execModeFinalize {
+	case execModeFinalize:
 		err = app.mempool.Remove(tx)
 		if err != nil && !errors.Is(err, mempool.ErrTxNotFound) {
 			return gInfo, nil, anteEvents,

baseapp/baseapp_test.go

@@ -829,11 +829,12 @@ var ctxTypes = []ctxType{QueryCtx, CheckTxCtx}
 
 func (c ctxType) GetCtx(t *testing.T, bapp *baseapp.BaseApp) sdk.Context {
 	t.Helper()
-	if c == QueryCtx {
+	switch c {
+	case QueryCtx:
 		ctx, err := bapp.CreateQueryContext(1, false)
 		require.NoError(t, err)
 		return ctx
-	} else if c == CheckTxCtx {
+	case CheckTxCtx:
 		return getCheckStateCtx(bapp)
 	}
 	// TODO: Not supported yet

baseapp/grpcrouter_test.go

@@ -56,7 +56,7 @@ func TestGRPCQueryRouter(t *testing.T) {
 func TestGRPCRouterHybridHandlers(t *testing.T) {
 	assertRouterBehaviour := func(helper *baseapp.QueryServiceTestHelper) {
 		// test getting the handler by name
-		handlers := helper.GRPCQueryRouter.HybridHandlerByRequestName("testpb.EchoRequest")
+		handlers := helper.HybridHandlerByRequestName("testpb.EchoRequest")
 		require.NotNil(t, handlers)
 		require.Len(t, handlers, 1)
 		handler := handlers[0]

baseapp/info.go

@@ -98,7 +98,7 @@ type voteInfoWrapper struct {
 var _ comet.VoteInfo = (*voteInfoWrapper)(nil)
 
 func (v voteInfoWrapper) GetBlockIDFlag() comet.BlockIDFlag {
-	return comet.BlockIDFlag(v.VoteInfo.BlockIdFlag)
+	return comet.BlockIDFlag(v.BlockIdFlag)
 }
 
 func (v voteInfoWrapper) Validator() comet.Validator {
@@ -159,11 +159,11 @@ func (r prepareProposalInfo) GetValidatorsHash() []byte {
 }
 
 func (r prepareProposalInfo) GetProposerAddress() []byte {
-	return r.RequestPrepareProposal.ProposerAddress
+	return r.ProposerAddress
 }
 
 func (r prepareProposalInfo) GetLastCommit() comet.CommitInfo {
-	return extendedCommitInfoWrapper{r.RequestPrepareProposal.LocalLastCommit}
+	return extendedCommitInfoWrapper{r.LocalLastCommit}
 }
 
 var _ comet.BlockInfo = (*prepareProposalInfo)(nil)
@@ -203,7 +203,7 @@ type extendedVoteInfoWrapper struct {
 var _ comet.VoteInfo = (*extendedVoteInfoWrapper)(nil)
 
 func (e extendedVoteInfoWrapper) GetBlockIDFlag() comet.BlockIDFlag {
-	return comet.BlockIDFlag(e.ExtendedVoteInfo.BlockIdFlag)
+	return comet.BlockIDFlag(e.BlockIdFlag)
 }
 
 func (e extendedVoteInfoWrapper) Validator() comet.Validator {

client/grpc_query_test.go

@@ -99,7 +99,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
 
 	// end of app init
 
-	s.ctx = app.BaseApp.NewContext(false)
+	s.ctx = app.NewContext(false)
 	s.cdc = cdc
 	queryHelper := baseapp.NewQueryServerTestHelper(s.ctx, interfaceRegistry)
 	types.RegisterQueryServer(queryHelper, bankKeeper)

client/keys/parse.go

@@ -99,7 +99,7 @@ func doParseKey(cmd *cobra.Command, config *sdk.Config, args []string) error {
 	}
 
 	output, _ := cmd.Flags().GetString(flags.FlagOutput)
-	if !(runFromBech32(outstream, addr, output) || runFromHex(config, outstream, addr, output)) {
+	if !runFromBech32(outstream, addr, output) && !runFromHex(config, outstream, addr, output) {
 		return errors.New("couldn't find valid bech32 nor hex data")
 	}
 

client/v2/autocli/msg.go

@@ -121,7 +121,7 @@ func (b *Builder) BuildMsgMethodCommand(descriptor protoreflect.MethodDescriptor
 		clientCtx = clientCtx.WithOutput(cmd.OutOrStdout())
 
 		fd := input.Descriptor().Fields().ByName(protoreflect.Name(flag.GetSignerFieldName(input.Descriptor())))
-		addressCodec := b.Builder.AddressCodec
+		addressCodec := b.AddressCodec
 
 		// set signer to signer field if empty
 		if addr := input.Get(fd).String(); addr == "" {
@@ -130,9 +130,9 @@ func (b *Builder) BuildMsgMethodCommand(descriptor protoreflect.MethodDescriptor
 				// override address codec if validator or consensus address
 				switch scalarType {
 				case flag.ValidatorAddressStringScalarType:
-					addressCodec = b.Builder.ValidatorAddressCodec
+					addressCodec = b.ValidatorAddressCodec
 				case flag.ConsensusAddressStringScalarType:
-					addressCodec = b.Builder.ConsensusAddressCodec
+					addressCodec = b.ConsensusAddressCodec
 				}
 			}