Merge branch 'master' into JonathanOppenheimer/sync-pr-1279-forbidgo

Author: JonathanOppenheimer

.github/workflows/ci.yml

@@ -22,7 +22,6 @@ jobs:
           cache-dependency-path: |
             go.sum
             tools/go.sum
-            tools/legacy-golangci-lint.sum
       - name: Run all lint checks
         run: ./scripts/run_task.sh lint-all-ci
       - name: Check go.mod and go.sum are up-to-date

.golangci.yml

@@ -1,36 +1,77 @@
-# This file configures github.com/golangci/golangci-lint.
-
+version: "2"
 run:
-  timeout: 10m
   tests: true
 
 linters:
-  disable-all: true
+  default: none
   enable:
-    - goimports
-    - gosimple
+    - bidichk
+    - copyloopvar
+    - durationcheck
+    - gocheckcompilerdirectives
     - govet
     - ineffassign
+    - mirror
     - misspell
+    - reassign
+    # - revive # only certain checks enabled
+    - staticcheck 
     - unconvert
-    - typecheck
     - unused
-    # - staticcheck
-    - bidichk
-    - durationcheck
-    - copyloopvar
     - whitespace
-    # - revive # only certain checks enabled
-    - durationcheck
-    - gocheckcompilerdirectives
-    - reassign
-    - mirror
-    - tenv
+  settings:
+    goconst:
+      min-len: 3 # minimum length of string constant
+      min-occurrences: 6 # minimum number of occurrences
+    staticcheck:
+      checks:
+        - all
+
+        # There's a lot of legacy code that triggers these warnings after upgrading golangci-lint.
+        # These checks are removed.
+        - -QF1001  # Apply De Morgan’s law
+        - -QF1002  # Convert an untagged switch comparing the same variable into a “tagged” switch
+        - -QF1003  # Convert if / else-if chains comparing the same variable into a tagged switch
+        - -QF1006  # Lift if + break into loop condition
+        - -QF1008  # Omit embedded fields from selector expression
+        - -QF1010  # Convert slice of bytes to string when printing it
+        - -SA1019  # Use of deprecated identifiers: triggers when you import or use something marked deprecated. 
+        - -SA4009  # A function argument is overwritten before its first use. 
+        - -SA9003  # Empty body in an if or else branch.
+        - -ST1003  # Poorly chosen identifier.
+        - -ST1008  # A function’s error value should be its last return value.
+        - -ST1016  # Use consistent method receiver names (e.g. avoid mixing `s *S`, `s S`, `t *T` in same type).
+
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - unused
+        # Exclude unused geth symbols from ethclient/ethclient.go to simplify upgrading Geth to a newer version.
+        path: ethclient\/ethclient\.go
+        text: (type `rpcProgress`|func `\(\*rpcProgress\)\.toSyncProgress`) is unused
+      - linters:
+          - goconst
+        path: (.+)_test\.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 
-linters-settings:
-  gofmt:
-    simplify: true
-  goconst:
-    min-len: 3 # minimum length of string constant
-    min-occurrences: 6 # minimum number of occurrences
-    ignore-tests: true
+formatters:
+  enable:
+    - goimports
+  settings:
+    gofmt:
+      simplify: true
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Taskfile.yml

@@ -73,8 +73,6 @@ tasks:
       - task: check-clean-branch
       - cmd: cd tools && go mod tidy
       - task: check-clean-branch
-      - cmd: cd tools && go mod tidy -modfile=legacy-golangci-lint.mod
-      - task: check-clean-branch
 
   coverage:
     desc: Display test coverage statistics from coverage.out file
@@ -125,6 +123,12 @@ tasks:
       - task: check-generate-codec
       - task: check-generate-mocks
       - task: check-generate-rlp
+  
+  lint-fix:
+    desc: Run golangci-lint with auto-fix where possible
+    # TODO(alarso16): Create a script to run the avalanchego linter as well.
+    # See https://github.com/ava-labs/coreth/issues/1374
+    cmd: go tool -modfile=tools/go.mod golangci-lint run --config .golangci.yml --fix
 
   setup-contracts:
     desc: Set up contracts by compiling Solidity contracts and generating Go bindings

go.mod

@@ -7,7 +7,7 @@ module github.com/ava-labs/subnet-evm
 // - Changes to the minimum golang version must also be replicated in:
 //   - go.mod (here)
 //   - tools/go.mod
-//   - tools/legacy-golangci-lint.mod
+//   - RELEASES.md
 //
 // - If updating between minor versions (e.g. 1.24.x -> 1.25.x):
 //   - Consider updating the version of golangci-lint (see tools/go.mod)

miner/worker.go

@@ -515,7 +515,6 @@ func (w *worker) handleResult(env *environment, block *types.Block, createdAt ti
 	var (
 		hash     = block.Hash()
 		receipts = make([]*types.Receipt, len(unfinishedReceipts))
-		logs     []*types.Log
 	)
 	for i, unfinishedReceipt := range unfinishedReceipts {
 		receipt := new(types.Receipt)
@@ -536,7 +535,6 @@ func (w *worker) handleResult(env *environment, block *types.Block, createdAt ti
 			*log = *unfinishedLog
 			log.BlockHash = hash
 		}
-		logs = append(logs, receipt.Logs...)
 	}
 
 	feesInEther, err := core.TotalFeesFloat(block, receipts)

scripts/lint.sh

@@ -94,11 +94,7 @@ function read_dirs {
 TESTS=${TESTS:-"golangci_lint avalanche_golangci_lint license_header require_error_is_no_funcs_as_params single_import interface_compliance_nil require_no_error_inline_func import_testing_only_in_tests"}
 
 function test_golangci_lint {
-  # Since there are 2 versions of golangci-lint in play, and only one
-  # can be managed by a given go.mod file, we use a separate mod file
-  # for the older version.
-  # TODO(marun) Switch everything to v2 when possible
-  go tool -modfile=tools/legacy-golangci-lint.mod golangci-lint run --config .golangci.yml
+  go tool -modfile=tools/go.mod golangci-lint run --config .golangci.yml
 }
 
 function test_avalanche_golangci_lint {