golangci-lint v1.57.2 (#9978)

remove some deprecated linters and fields:
https://golangci-lint.run/product/changelog/

.github/workflows/ci.yml

@@ -57,7 +57,7 @@ jobs:
         if: runner.os == 'Linux'
         uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.56.1
+          version: v1.57.2
           skip-build-cache: true
           args: --help
 

.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  deadline: 10m
+  timeout: 10m
   build-tags:
     - nosqlite
     - noboltdb
@@ -41,21 +41,15 @@ linters:
 #    - stylecheck
 
 linters-settings:
-  gocritic:
-    # Which checks should be enabled; can't be combined with 'disabled-checks';
-    # See https://go-critic.github.io/overview#checks-overview
-    # To check which checks are enabled run `GL_DEBUG=gocritic ./build/bin/golangci-lint run`
-    # By default list of stable checks is used.
+  gocritic: # see https://golangci-lint.run/usage/linters/#gocritic and https://go-critic.github.io/overview#checks-overview
+    enabled-tags:
+      - performance
+      - diagnostic
     enabled-checks:
       - ruleguard
-      - truncateCmp
-      # - defaultCaseOrder
-
-    # Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty
     disabled-checks:
       - regexpMust
       - appendAssign
-      #      - hugeParam
       - rangeValCopy
       - exitAfterDefer
       - elseif
@@ -66,19 +60,22 @@ linters-settings:
       - captLocal
       - commentFormatting
       - ifElseChain
-      - importShadow
-      - paramTypeCombine
-      - builtinShadow
-      - typeUnparen
 
-    # Enable multiple checks by tags, run `GL_DEBUG=gocritic golangci-lint run` to see all tags and checks.
-    # Empty list by default. See https://github.com/go-critic/go-critic#usage -> section "Tags".
-    enabled-tags:
-      - performance
-      - diagnostic
-      - opinionated
-    disabled-tags:
-      - experimental
+      # diagnostigs tag: possible bugs. need enable checks in future
+      - sloppyReassign
+      - sprintfQuotedString
+      - deferInLoop
+      - nilValReturn
+      - evalOrder
+      - returnAfterHttpError
+      - weakCond
+      - builtinShadowDecl
+      - unnecessaryDefer
+      - uncheckedInlineErr
+      - preferStringWriter
+      - commentedOutCode
+      - preferFprint
+
     settings:
       ruleguard:
         rules: "rules.go"
@@ -90,9 +87,6 @@ linters-settings:
         sizeThreshold: 512
         # whether to check test functions (default true)
         skipTestFuncs: true
-      truncateCmp:
-        # whether to skip int/uint/uintptr types (default true)
-        skipArchDependent: true
       underef:
         # whether to skip (*x).method() calls where x is a pointer receiver (default true)
         skipRecvDeref: true
@@ -107,7 +101,7 @@ linters-settings:
     min-len: 2
     min-occurrences: 2
   gofmt:
-    auto-fix: false
+    simplify: false
 
 issues:
   exclude-rules:
@@ -125,20 +119,17 @@ issues:
       linters:
         - gosec
         - unused
-        - deadcode
         - gocritic
         - perfsprint
     - path: hack\.go
       linters:
         - gosec
         - unused
-        - deadcode
         - gocritic
     - path: cmd/devp2p
       linters:
         - gosec
         - unused
-        - deadcode
         - gocritic
     - path: metrics/sample\.go
       linters:

common/paths/paths.go

@@ -36,7 +36,7 @@ func DefaultDataDir() string {
 			if xdgDataDir := os.Getenv("XDG_DATA_HOME"); xdgDataDir != "" {
 				return filepath.Join(xdgDataDir, strings.ToLower(dirname))
 			}
-			return filepath.Join(home, ".local/share", strings.ToLower(dirname))
+			return filepath.Join(home, ".local", "share", strings.ToLower(dirname))
 		}
 	}
 	// As we cannot guess a stable location, return empty and handle later

erigon-lib/.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
         if: matrix.os == 'ubuntu-20.04'
         uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.56
+          version: v1.57.2
           skip-build-cache: true
 
       - name: Lint source code licenses

erigon-lib/.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  deadline: 10m
+  timeout: 10m
   build-tags:
     - nosqlite
     - noboltdb
@@ -34,45 +34,42 @@ linters:
 #    - stylecheck
 
 linters-settings:
-  gocritic:
-    # Which checks should be enabled; can't be combined with 'disabled-checks';
-    # See https://go-critic.github.io/overview#checks-overview
-    # To check which checks are enabled run `GL_DEBUG=gocritic golangci-lint run`
-    # By default list of stable checks is used.
+  gocritic: # see https://golangci-lint.run/usage/linters/#gocritic and https://go-critic.github.io/overview#checks-overview
+    enabled-tags:
+      - performance
+      - diagnostic
     enabled-checks:
       - ruleguard
-      - truncateCmp
-    #      - defaultCaseOrder
-
-    # Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty
     disabled-checks:
-      - regexpMust
-      #      - hugeParam
       - rangeValCopy
       - exitAfterDefer
       - elseif
       - dupBranchBody
       - assignOp
       - singleCaseSwitch
-      - unlambda
       - captLocal
       - commentFormatting
       - ifElseChain
       - appendAssign
+      - preferFprint
+
+      # diagnostigs tag: possible bugs. need enable checks in future
+      - sloppyReassign
+      - sprintfQuotedString
+      - deferInLoop
+      - nilValReturn
+      - evalOrder
+      - commentedOutCode
+      - returnAfterHttpError
+      - weakCond
+      - builtinShadowDecl
+      - unnecessaryDefer
+      - uncheckedInlineErr
+      - preferStringWriter
 
-    # Enable multiple checks by tags, run `GL_DEBUG=gocritic golangci-lint run` to see all tags and checks.
-    # Empty list by default. See https://github.com/go-critic/go-critic#usage -> section "Tags".
-    enabled-tags:
-      - performance
-      - diagnostic
-    #      - style
-    #      - experimental
-    #      - opinionated
-    disabled-tags:
-      - experimental
-    ruleguard:
-      rules: "rules.go"
     settings:
+      ruleguard:
+        rules: "rules.go"
       hugeParam:
         # size in bytes that makes the warning trigger (default 80)
         sizeThreshold: 1000
@@ -81,9 +78,6 @@ linters-settings:
         sizeThreshold: 512
         # whether to check test functions (default true)
         skipTestFuncs: true
-      truncateCmp:
-        # whether to skip int/uint/uintptr types (default true)
-        skipArchDependent: true
       underef:
         # whether to skip (*x).method() calls where x is a pointer receiver (default true)
         skipRecvDeref: true
@@ -97,7 +91,7 @@ linters-settings:
     min-len: 2
     min-occurrences: 2
   gofmt:
-    auto-fix: false
+    simplify: false
 
 issues:
   exclude-rules:
@@ -115,20 +109,17 @@ issues:
       linters:
         - gosec
         - unused
-        - deadcode
         - gocritic
         - perfsprint
     - path: hack\.go
       linters:
         - gosec
         - unused
-        - deadcode
         - gocritic
     - path: cmd/devp2p
       linters:
         - gosec
         - unused
-        - deadcode
         - gocritic
     - path: metrics/sample\.go
       linters:

erigon-lib/common/datadir/dirs.go

@@ -72,8 +72,8 @@ func New(datadir string) Dirs {
 		Downloader:      filepath.Join(datadir, "downloader"),
 		TxPool:          filepath.Join(datadir, "txpool"),
 		Nodes:           filepath.Join(datadir, "nodes"),
-		CaplinBlobs:     filepath.Join(datadir, "caplin/blobs"),
-		CaplinIndexing:  filepath.Join(datadir, "caplin/indexing"),
+		CaplinBlobs:     filepath.Join(datadir, "caplin", "blobs"),
+		CaplinIndexing:  filepath.Join(datadir, "caplin", "indexing"),
 	}
 
 	dir.MustExist(dirs.Chaindata, dirs.Tmp,

erigon-lib/kv/membatchwithdb/memory_mutation.go

@@ -48,7 +48,7 @@ type MemoryMutation struct {
 // batch.Commit()
 func NewMemoryBatch(tx kv.Tx, tmpDir string, logger log.Logger) *MemoryMutation {
 	tmpDB := mdbx.NewMDBX(logger).InMem(tmpDir).GrowthStep(64 * datasize.MB).MapSize(512 * datasize.GB).MustOpen()
-	memTx, err := tmpDB.BeginRw(context.Background())
+	memTx, err := tmpDB.BeginRw(context.Background()) // nolint:gocritic
 	if err != nil {
 		panic(err)
 	}
@@ -507,37 +507,47 @@ func (m *MemoryMutation) Flush(tx kv.RwTx) error {
 	// Iterate over each bucket and apply changes accordingly.
 	for _, bucket := range buckets {
 		if isTablePurelyDupsort(bucket) {
-			cbucket, err := m.memTx.CursorDupSort(bucket)
-			if err != nil {
-				return err
-			}
-			defer cbucket.Close()
-			dbCursor, err := tx.RwCursorDupSort(bucket)
-			if err != nil {
-				return err
-			}
-			defer dbCursor.Close()
-			for k, v, err := cbucket.First(); k != nil; k, v, err = cbucket.Next() {
+			if err := func() error {
+				cbucket, err := m.memTx.CursorDupSort(bucket)
 				if err != nil {
 					return err
 				}
-				if err := dbCursor.Put(k, v); err != nil {
+				defer cbucket.Close()
+				dbCursor, err := tx.RwCursorDupSort(bucket)
+				if err != nil {
 					return err
 				}
-			}
-		} else {
-			cbucket, err := m.memTx.Cursor(bucket)
-			if err != nil {
+				defer dbCursor.Close()
+				for k, v, err := cbucket.First(); k != nil; k, v, err = cbucket.Next() {
+					if err != nil {
+						return err
+					}
+					if err := dbCursor.Put(k, v); err != nil {
+						return err
+					}
+				}
+				return nil
+			}(); err != nil {
 				return err
 			}
-			defer cbucket.Close()
-			for k, v, err := cbucket.First(); k != nil; k, v, err = cbucket.Next() {
+		} else {
+			if err := func() error {
+				cbucket, err := m.memTx.Cursor(bucket)
 				if err != nil {
 					return err
 				}
-				if err := tx.Put(bucket, k, v); err != nil {
-					return err
+				defer cbucket.Close()
+				for k, v, err := cbucket.First(); k != nil; k, v, err = cbucket.Next() {
+					if err != nil {
+						return err
+					}
+					if err := tx.Put(bucket, k, v); err != nil {
+						return err
+					}
 				}
+				return nil
+			}(); err != nil {
+				return err
 			}
 		}
 	}

erigon-lib/kv/memdb/memory_database.go

@@ -50,7 +50,7 @@ func NewTestDB(tb testing.TB) kv.RwDB {
 
 func BeginRw(tb testing.TB, db kv.RwDB) kv.RwTx {
 	tb.Helper()
-	tx, err := db.BeginRw(context.Background())
+	tx, err := db.BeginRw(context.Background()) //nolint:gocritic
 	if err != nil {
 		tb.Fatal(err)
 	}
@@ -60,7 +60,7 @@ func BeginRw(tb testing.TB, db kv.RwDB) kv.RwTx {
 
 func BeginRo(tb testing.TB, db kv.RoDB) kv.Tx {
 	tb.Helper()
-	tx, err := db.BeginRo(context.Background())
+	tx, err := db.BeginRo(context.Background()) //nolint:gocritic
 	if err != nil {
 		tb.Fatal(err)
 	}
@@ -97,7 +97,7 @@ func NewTestTx(tb testing.TB) (kv.RwDB, kv.RwTx) {
 	tmpDir := tb.TempDir()
 	db := New(tmpDir)
 	tb.Cleanup(db.Close)
-	tx, err := db.BeginRw(context.Background())
+	tx, err := db.BeginRw(context.Background()) //nolint:gocritic
 	if err != nil {
 		tb.Fatal(err)
 	}

erigon-lib/kv/remotedb/kv_remote.go

@@ -184,7 +184,7 @@ func (db *DB) BeginRo(ctx context.Context) (txn kv.Tx, err error) {
 	return &tx{ctx: ctx, db: db, stream: stream, streamCancelFn: streamCancelFn, viewID: msg.ViewId, id: msg.TxId}, nil
 }
 func (db *DB) BeginTemporalRo(ctx context.Context) (kv.TemporalTx, error) {
-	t, err := db.BeginRo(ctx)
+	t, err := db.BeginRo(ctx) //nolint:gocritic
 	if err != nil {
 		return nil, err
 	}

erigon-lib/kv/remotedbserver/remotedbserver.go

@@ -136,7 +136,7 @@ func (s *KvServer) begin(ctx context.Context) (id uint64, err error) {
 	}
 	s.txsMapLock.Lock()
 	defer s.txsMapLock.Unlock()
-	tx, errBegin := s.kv.BeginRo(ctx)
+	tx, errBegin := s.kv.BeginRo(ctx) //nolint:gocritic
 	if errBegin != nil {
 		return 0, errBegin
 	}
@@ -158,7 +158,7 @@ func (s *KvServer) renew(ctx context.Context, id uint64) (err error) {
 		defer tx.Unlock()
 		tx.Rollback()
 	}
-	newTx, errBegin := s.kv.BeginRo(ctx)
+	newTx, errBegin := s.kv.BeginRo(ctx) //nolint:gocritic
 	if errBegin != nil {
 		return fmt.Errorf("kvserver: %w", err)
 	}

erigon-lib/seg/compress.go

@@ -95,7 +95,7 @@ func NewCompressor(ctx context.Context, logPrefix, outputFile, tmpDir string, mi
 	wg.Add(workers)
 	suffixCollectors := make([]*etl.Collector, workers)
 	for i := 0; i < workers; i++ {
-		collector := etl.NewCollector(logPrefix+"_dict", tmpDir, etl.NewSortableBuffer(etl.BufferOptimalSize/2), logger)
+		collector := etl.NewCollector(logPrefix+"_dict", tmpDir, etl.NewSortableBuffer(etl.BufferOptimalSize/2), logger) //nolint:gocritic
 		collector.LogLvl(lvl)
 
 		suffixCollectors[i] = collector