Add lints for unclosed files and fix numerous lints in tests (#18998)

Add the temp file lints needed to catch the locked file issue I had on
Windows tests here #18197. Also
fixes a bunch of other lints that were masked for tests.

Author: anacrolix

.claude/settings.json

@@ -0,0 +1,13 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(make test-all:*)",
+      "Bash(go test:*)",
+      "Bash(go get:*)",
+      "Bash(GOEXPERIMENT=synctest go vet:*)",
+      "Bash(make lint:*)",
+      "Bash(git fetch:*)",
+      "Bash(go mod tidy:*)"
+    ]
+  }
+}

.github/workflows/lint.yml

@@ -48,9 +48,4 @@ jobs:
         with:
           go-version: '1.25'
 
-      - name: Install golangci-lint
-        uses: golangci/golangci-lint-action@v9
-        with:
-          version: 'v2.8.0'
-
       - run: make lint

.golangci.yml

@@ -113,7 +113,6 @@ linters:
           - staticcheck
         text: ST1019|ST1029|ST5011|QF1003|SA1019|QF1008|S1021|QF1001|SA6005|S1002|QF1002|QF1012|QF1006|ST1005|SA5011|ST1023|ST1012|QF1011|S1019|S1000|S1000|S1009|ST1008|S1016|S1016|ST1017|SA4009|QF1007|SA6002|QF1010|SA9003
       - linters:
-          - gocritic
           - gosec
           - perfsprint
           - unused

Makefile

@@ -345,10 +345,6 @@ kurtosis-cleanup:
 	@echo "-----------------------------------\n"
 	kurtosis enclave rm -f makefile-kurtosis-testnet
 
-## lint-deps:                         install lint dependencies
-lint-deps:
-	@./tools/golangci_lint.sh --install-deps
-
 ## lintci:                            run golangci-lint linters
 lintci:
 	@CGO_CXXFLAGS="$(CGO_CXXFLAGS)" ./tools/golangci_lint.sh

agents.md

@@ -55,3 +55,17 @@ Erigon is a high-performance Ethereum execution client with embedded consensus l
 Commit messages: prefix with package(s) modified, e.g., `eth, rpc: make trace configs optional`
 
 **Important**: Always run `make lint` after making code changes and before committing. Fix any linter errors before proceeding.
+
+## Lint Notes
+
+The linter (`make lint`) is non-deterministic in which files it scans — new issues may appear on subsequent runs. Run lint repeatedly until clean.
+
+Common lint categories and fixes:
+- **ruleguard (defer tx.Rollback/cursor.Close):** The error check must come *before* `defer tx.Rollback()`. Never remove an explicit `.Close()` or `.Rollback()` — add `defer` as a safety net alongside it, since the timing of the explicit call may matter.
+- **prealloc:** Pre-allocate slices when the length is known from a range.
+- **unslice:** Remove redundant `[:]` on variables that are already slices.
+- **newDeref:** Replace `*new(T)` with `T{}`.
+- **appendCombine:** Combine consecutive `append` calls into one.
+- **rangeExprCopy:** Use `&x` in `range` to avoid copying large arrays.
+- **dupArg:** For intentional `x.Equal(x)` self-equality tests, suppress with `//nolint:gocritic`.
+- **Loop ruleguard in benchmarks:** For `BeginRw`/`BeginRo` inside loops where `defer` doesn't apply, suppress with `//nolint:gocritic`.

cl/cltypes/solid/sync_committee_test.go

@@ -79,7 +79,7 @@ func TestSyncCommittee(t *testing.T) {
 	// Test Equal
 	otherSyncCommittee := &SyncCommittee{}
 	assert.False(t, syncCommittee.Equal(otherSyncCommittee))
-	assert.True(t, syncCommittee.Equal(syncCommittee))
+	assert.True(t, syncCommittee.Equal(syncCommittee)) //nolint:gocritic
 
 	// Test HashSSZ
 	expectedRoot := common.HexToHash("28628f3f10fa1070f2a42aeeeae792cd6ded1ef81030104e765e1498a1cfcfbd") // Example expected root

cl/persistence/beacon_indicies/indicies_test.go

@@ -39,7 +39,8 @@ func setupTestDB(t *testing.T) kv.RwDB {
 func TestWriteBlockRoot(t *testing.T) {
 	db := setupTestDB(t)
 	defer db.Close()
-	tx, _ := db.BeginRw(context.Background())
+	tx, err := db.BeginRw(context.Background())
+	require.NoError(t, err)
 	defer tx.Rollback()
 
 	// Mock a block
@@ -72,7 +73,8 @@ func TestWriteBlockRoot(t *testing.T) {
 func TestReadParentBlockRoot(t *testing.T) {
 	db := setupTestDB(t)
 	defer db.Close()
-	tx, _ := db.BeginRw(context.Background())
+	tx, err := db.BeginRw(context.Background())
+	require.NoError(t, err)
 	defer tx.Rollback()
 
 	mockParentRoot := common.Hash{1}
@@ -96,7 +98,8 @@ func TestReadParentBlockRoot(t *testing.T) {
 func TestTruncateCanonicalChain(t *testing.T) {
 	db := setupTestDB(t)
 	defer db.Close()
-	tx, _ := db.BeginRw(context.Background())
+	tx, err := db.BeginRw(context.Background())
+	require.NoError(t, err)
 	defer tx.Rollback()
 
 	mockParentRoot := common.Hash{1}
@@ -126,7 +129,8 @@ func TestTruncateCanonicalChain(t *testing.T) {
 func TestReadBeaconBlockHeader(t *testing.T) {
 	db := setupTestDB(t)
 	defer db.Close()
-	tx, _ := db.BeginRw(context.Background())
+	tx, err := db.BeginRw(context.Background())
+	require.NoError(t, err)
 	defer tx.Rollback()
 
 	mockParentRoot := common.Hash{1}
@@ -162,7 +166,8 @@ func TestReadBeaconBlockHeader(t *testing.T) {
 func TestWriteExecutionBlockNumber(t *testing.T) {
 	db := setupTestDB(t)
 	defer db.Close()
-	tx, _ := db.BeginRw(context.Background())
+	tx, err := db.BeginRw(context.Background())
+	require.NoError(t, err)
 	defer tx.Rollback()
 
 	tHash := common.HexToHash("0x2")
@@ -179,7 +184,8 @@ func TestWriteExecutionBlockNumber(t *testing.T) {
 func TestWriteExecutionBlockHash(t *testing.T) {
 	db := setupTestDB(t)
 	defer db.Close()
-	tx, _ := db.BeginRw(context.Background())
+	tx, err := db.BeginRw(context.Background())
+	require.NoError(t, err)
 	defer tx.Rollback()
 
 	tHash := common.HexToHash("0x2")

cl/sentinel/handlers/blobs_test.go

@@ -86,7 +86,9 @@ func TestBlobsByRangeHandler(t *testing.T) {
 	_, indiciesDB := setupStore(t)
 	store := tests.NewMockBlockReader()
 
-	tx, _ := indiciesDB.BeginRw(ctx)
+	tx, err := indiciesDB.BeginRw(ctx)
+	require.NoError(t, err)
+	defer tx.Rollback()
 
 	startSlot := uint64(100)
 	count := uint64(10)
@@ -99,7 +101,7 @@ func TestBlobsByRangeHandler(t *testing.T) {
 	r, _ := h.Header.HashSSZ()
 	require.NoError(t, blobStorage.WriteBlobSidecars(ctx, r, sidecars))
 
-	tx.Commit()
+	require.NoError(t, tx.Commit())
 
 	ethClock := getEthClock(t)
 	c := NewConsensusHandlers(
@@ -207,7 +209,9 @@ func TestBlobsByIdentifiersHandler(t *testing.T) {
 	_, indiciesDB := setupStore(t)
 	store := tests.NewMockBlockReader()
 
-	tx, _ := indiciesDB.BeginRw(ctx)
+	tx, err := indiciesDB.BeginRw(ctx)
+	require.NoError(t, err)
+	defer tx.Rollback()
 
 	startSlot := uint64(100)
 	count := uint64(10)
@@ -221,7 +225,7 @@ func TestBlobsByIdentifiersHandler(t *testing.T) {
 	r, _ := h.Header.HashSSZ()
 	require.NoError(t, blobStorage.WriteBlobSidecars(ctx, r, sidecars))
 
-	tx.Commit()
+	require.NoError(t, tx.Commit())
 
 	c := NewConsensusHandlers(
 		ctx,

cl/sentinel/handlers/blocks_by_range_test.go

@@ -62,14 +62,16 @@ func TestBlocksByRootHandler(t *testing.T) {
 	_, indiciesDB := setupStore(t)
 	store := tests.NewMockBlockReader()
 
-	tx, _ := indiciesDB.BeginRw(ctx)
+	tx, err := indiciesDB.BeginRw(ctx)
+	require.NoError(t, err)
+	defer tx.Rollback()
 
 	startSlot := uint64(100)
 	count := uint64(10)
 	step := uint64(1)
 
 	expBlocks := populateDatabaseWithBlocks(t, store, tx, startSlot, count)
-	tx.Commit()
+	require.NoError(t, tx.Commit())
 
 	ethClock := getEthClock(t)
 	_, beaconCfg := clparams.GetConfigsByNetwork(1)

cl/sentinel/handlers/blocks_by_root_test.go

@@ -64,7 +64,9 @@ func TestBlocksByRangeHandler(t *testing.T) {
 	_, indiciesDB := setupStore(t)
 	store := tests.NewMockBlockReader()
 
-	tx, _ := indiciesDB.BeginRw(ctx)
+	tx, err := indiciesDB.BeginRw(ctx)
+	require.NoError(t, err)
+	defer tx.Rollback()
 
 	startSlot := uint64(100)
 	count := uint64(10)
@@ -161,5 +163,4 @@ func TestBlocksByRangeHandler(t *testing.T) {
 	}
 
 	defer indiciesDB.Close()
-	defer tx.Rollback()
 }