chore: lint fixes (#1074)

Author: aljo242

.github/workflows/lint.yml

@@ -17,6 +17,5 @@ jobs:
         with:
           go-version: "1.23"
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
-        with:
-          version: v1.55.2
+        run: |
+          make lint

.golangci.yml

@@ -1,20 +1,15 @@
+version: "2"
 run:
   tests: true
-  # timeout for analysis, e.g. 30s, 5m, default is 1m
-  timeout: 5m
-
 linters:
-  disable-all: true
+  default: none
   enable:
     - bodyclose
     - dogsled
     - errcheck
-    - exportloopref
     - goconst
     - gocritic
-    - gofumpt
     - gosec
-    - gosimple
     - govet
     - ineffassign
     - misspell
@@ -23,44 +18,56 @@ linters:
     - prealloc
     - revive
     - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unparam
     - unused
-
-linters-settings:
-  nolintlint:
-    allow-leading-space: true
-    require-explanation: false
-    require-specific: true
-
+  settings:
+    nolintlint:
+      require-explanation: false
+      require-specific: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - gosec
+        text: Use of weak random number generator
+      - linters:
+          - golint
+        text: comment on exported var
+      - linters:
+          - golint
+        text: don't use an underscore in package name
+      - linters:
+          - nolintlint
+        text: should be written without leading space as
+      - linters:
+          - staticcheck
+        text: 'ST1003:'
+      - linters:
+          - staticcheck
+        text: 'ST1016:'
+      - linters:
+          - staticcheck
+        path: migrations
+        text: 'SA1019:'
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
-  exclude-rules:
-    - text: "Use of weak random number generator"
-      linters:
-        - gosec
-    - text: "comment on exported var"
-      linters:
-        - golint
-    - text: "don't use an underscore in package name"
-      linters:
-        - golint
-    - text: "should be written without leading space as"
-      linters:
-        - nolintlint
-    - text: "ST1003:"
-      linters:
-        - stylecheck
-    # FIXME: Disabled until golangci-lint updates stylecheck with this fix:
-    # https://github.com/dominikh/go-tools/issues/389
-    - text: "ST1016:"
-      linters:
-        - stylecheck
-    - path: "migrations"
-      text: "SA1019:"
-      linters:
-        - staticcheck
-
   max-issues-per-linter: 10000
   max-same-issues: 10000
+formatters:
+  enable:
+    - gofumpt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -39,17 +39,17 @@ format:
 
 # look into .golangci.yml for enabling / disabling linters
 golangci_lint_cmd=golangci-lint
-golangci_version=v1.59.1
+golangci_version=v2.0.2
 
 lint:
 	@echo "--> Running linter"
-	@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)
 	@$(golangci_lint_cmd) run --timeout=10m
 
 lint-fix:
 	@echo "--> Running linter"
-	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
-	@$(golangci_lint_cmd) run --fix --out-format=tab --issues-exit-code=0
+	@go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(golangci_version)
+	@$(golangci_lint_cmd) run --fix --issues-exit-code=0
 
 # bench is the basic tests that shouldn't crash an aws instance
 bench:

basic_test.go

@@ -244,7 +244,7 @@ func TestRemove(_ *testing.T) {
 
 	// insert a bunch of random nodes
 	keys := make([][]byte, size)
-	l := int32(len(keys))
+	l := int32(len(keys)) //nolint: gosec // used in testing
 	for i := 0; i < size; i++ {
 		key := iavlrand.RandBytes(keyLen)
 		t1.Set(key, iavlrand.RandBytes(dataLen))

benchmarks/bench_test.go

@@ -74,7 +74,7 @@ func runKnownQueriesFast(b *testing.B, t *iavl.MutableTree, keys [][]byte) {
 	isFastCacheEnabled, err := t.IsFastCacheEnabled() // to ensure fast storage is enabled
 	require.NoError(b, err)
 	require.True(b, isFastCacheEnabled)
-	l := int32(len(keys))
+	l := int32(len(keys)) //nolint: gosec // used in testing
 	for i := 0; i < b.N; i++ {
 		q := keys[mrand.Int31n(l)]
 		_, err := t.Get(q)
@@ -116,7 +116,7 @@ func runKnownQueriesSlow(b *testing.B, t *iavl.MutableTree, keys [][]byte) {
 	require.NoError(b, err)
 	require.False(b, isFastCacheEnabled)
 	b.StartTimer()
-	l := int32(len(keys))
+	l := int32(len(keys)) //nolint: gosec // used in testing
 	for i := 0; i < b.N; i++ {
 		q := keys[mrand.Int31n(l)]
 		index, value, err := itree.GetWithIndex(q)
@@ -173,7 +173,7 @@ func iterate(b *testing.B, itr corestore.Iterator, expectedSize int) {
 // }
 
 func runUpdate(b *testing.B, t *iavl.MutableTree, dataLen, blockSize int, keys [][]byte) *iavl.MutableTree {
-	l := int32(len(keys))
+	l := int32(len(keys)) //nolint: gosec // used in testing
 	for i := 1; i <= b.N; i++ {
 		key := keys[mrand.Int31n(l)]
 		_, err := t.Set(key, randBytes(dataLen))
@@ -202,7 +202,7 @@ func runUpdate(b *testing.B, t *iavl.MutableTree, dataLen, blockSize int, keys [
 
 // runBlock measures time for an entire block, not just one tx
 func runBlock(b *testing.B, t *iavl.MutableTree, keyLen, dataLen, blockSize int, keys [][]byte) *iavl.MutableTree {
-	l := int32(len(keys))
+	l := int32(len(keys)) //nolint: gosec // used in testing
 
 	// XXX: This was adapted to work with VersionedTree but needs to be re-thought.
 

benchmarks/cosmos-exim/main.go

@@ -50,7 +50,7 @@ func (s *Stats) AddNode(node *iavl.ExportNode) {
 	if node.Height == 0 {
 		s.leafNodes++
 	}
-	s.size += uint64(len(node.Key) + len(node.Value) + 8 + 1)
+	s.size += uint64(len(node.Key) + len(node.Value) + 8 + 1) //nolint: gosec // used in testing
 }
 
 func (s *Stats) String() string {

cmd/go.mod

@@ -1,10 +1,11 @@
 module github.com/cosmos/iavl/cmd
 
-go 1.21
-toolchain go1.23.4
+go 1.23
+
+toolchain go1.23.7
 
 require (
-	cosmossdk.io/core v1.0.0-alpha.6
+	cosmossdk.io/core v1.0.0
 	cosmossdk.io/log v1.3.1
 	github.com/cosmos/iavl v1.2.0
 )

cmd/go.sum

@@ -1,5 +1,5 @@
-cosmossdk.io/core v1.0.0-alpha.6 h1:5ukC4JcQKmemLQXcAgu/QoOvJI50hpBkIIg4ZT2EN8E=
-cosmossdk.io/core v1.0.0-alpha.6/go.mod h1:3u9cWq1FAVtiiCrDPpo4LhR+9V6k/ycSG4/Y/tREWCY=
+cosmossdk.io/core v1.0.0 h1:e7XBbISOytLBOXMVwpRPixThXqEkeLGlg8no/qpgS8U=
+cosmossdk.io/core v1.0.0/go.mod h1:mKIp3RkoEmtqdEdFHxHwWAULRe+79gfdOvmArrLDbDc=
 cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI=
 cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=

cmd/iaviewer/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"bytes"
 	"crypto/sha256"
-	"encoding/hex"
 	"errors"
 	"fmt"
 	"os"

compress.go

@@ -98,7 +98,7 @@ func (i *CompressImporter) Add(node *ExportNode) error {
 func deltaEncode(key, lastKey []byte) []byte {
 	var sizeBuf [binary.MaxVarintLen64]byte
 	shared := diffOffset(lastKey, key)
-	n := binary.PutUvarint(sizeBuf[:], uint64(shared))
+	n := binary.PutUvarint(sizeBuf[:], uint64(shared)) // nolint:gosec // shared will always be positive
 	return append(sizeBuf[:n], key[shared:]...)
 }
 

diff_test.go

@@ -46,7 +46,7 @@ func genChangeSets(r *rand.Rand, n int) []*ChangeSet {
 		start, count, step := r.Int63n(1000), r.Int63n(1000), r.Int63n(10)
 		for i := start; i < start+count*step; i += step {
 			value := make([]byte, 8)
-			binary.LittleEndian.PutUint64(value, uint64(i))
+			binary.LittleEndian.PutUint64(value, uint64(i)) // nolint:gosec // testing check
 
 			key := fmt.Sprintf("test-%d", i)
 			items[key] = &KVPair{

internal/bytes/bytes.go

@@ -57,11 +57,11 @@ func (bz HexBytes) String() string {
 func (bz HexBytes) Format(s fmt.State, verb rune) {
 	switch verb {
 	case 'p':
-		if _, err := s.Write([]byte(fmt.Sprintf("%p", bz))); err != nil {
+		if _, err := fmt.Fprintf(s, "%p", bz); err != nil {
 			panic(err)
 		}
 	default:
-		if _, err := s.Write([]byte(fmt.Sprintf("%X", []byte(bz)))); err != nil {
+		if _, err := fmt.Fprintf(s, "%X", []byte(bz)); err != nil {
 			panic(err)
 		}
 	}

internal/encoding/encoding_test.go

@@ -75,7 +75,7 @@ func TestDecodeBytes(t *testing.T) {
 				require.Equal(t, varintBytes, n)
 			} else {
 				require.NoError(t, err)
-				require.Equal(t, uint64(n), uint64(varintBytes)+tc.lengthPrefix)
+				require.Equal(t, uint64(n), uint64(varintBytes)+tc.lengthPrefix) // nolint:gosec // testing check
 				require.Equal(t, tc.bz[:tc.lengthPrefix], b)
 			}
 		})

internal/rand/random.go

@@ -43,7 +43,7 @@ func (r *Rand) init() {
 		seed |= uint64(bz[i])
 		seed <<= 8
 	}
-	r.reset(int64(seed))
+	r.reset(int64(seed)) // nolint:gosec // only used in unsafe rand operations
 }
 
 func (r *Rand) reset(seed int64) {
@@ -110,7 +110,7 @@ MAIN_LOOP:
 }
 
 func (r *Rand) Uint16() uint16 {
-	return uint16(r.Uint32() & (1<<16 - 1))
+	return uint16(r.Uint32() & (1<<16 - 1)) // nolint:gosec // only used in unsafe rand operations
 }
 
 func (r *Rand) Uint32() uint32 {
@@ -128,19 +128,19 @@ func (r *Rand) Uint() uint {
 	r.Lock()
 	i := r.rand.Int()
 	r.Unlock()
-	return uint(i)
+	return uint(i) // nolint:gosec // only used in unsafe rand operations
 }
 
 func (r *Rand) Int16() int16 {
-	return int16(r.Uint32() & (1<<16 - 1))
+	return int16(r.Uint32() & (1<<16 - 1)) // nolint:gosec // only used in unsafe rand operations
 }
 
 func (r *Rand) Int32() int32 {
-	return int32(r.Uint32())
+	return int32(r.Uint32()) // nolint:gosec // only used in unsafe rand operations
 }
 
 func (r *Rand) Int64() int64 {
-	return int64(r.Uint64())
+	return int64(r.Uint64()) // nolint:gosec // only used in unsafe rand operations
 }
 
 func (r *Rand) Int() int {
@@ -193,7 +193,7 @@ func (r *Rand) Float64() float64 {
 }
 
 func (r *Rand) Time() time.Time {
-	return time.Unix(int64(r.Uint64()), 0)
+	return time.Unix(int64(r.Uint64()), 0) // nolint:gosec // only used in unsafe rand operations
 }
 
 // Bytes returns n random bytes generated from the internal

keyformat/key_format.go

@@ -155,13 +155,13 @@ func scan(a interface{}, value []byte) {
 	switch v := a.(type) {
 	case *int64:
 		// Negative values will be mapped correctly when read in as uint64 and then type converted
-		*v = int64(binary.BigEndian.Uint64(value))
+		*v = int64(binary.BigEndian.Uint64(value)) // nolint:gosec // the integer is always positive
 	case *uint64:
 		*v = binary.BigEndian.Uint64(value)
 	case *uint32:
 		*v = binary.BigEndian.Uint32(value)
 	case *int32:
-		*v = int32(binary.BigEndian.Uint32(value))
+		*v = int32(binary.BigEndian.Uint32(value)) // nolint:gosec // the integer is always positive
 	case *[]byte:
 		*v = value
 	case *big.Int:
@@ -176,16 +176,16 @@ func format(a interface{}) []byte {
 	case uint64:
 		return formatUint64(v)
 	case int64:
-		return formatUint64(uint64(v))
+		return formatUint64(uint64(v)) // nolint:gosec // the integer version is always positive
 	// Provide formatting from int,uint as a convenience to avoid casting arguments
 	case uint:
 		return formatUint64(uint64(v))
 	case int:
-		return formatUint64(uint64(v))
+		return formatUint64(uint64(v)) // nolint:gosec // the integer version is always positive
 	case uint32:
 		return formatUint32(v)
 	case int32:
-		return formatUint32(uint32(v))
+		return formatUint32(uint32(v)) // nolint:gosec // the integer version is always positive
 	case []byte:
 		return v
 	default:

keyformat/key_format_test.go

@@ -116,7 +116,7 @@ func TestOverflow(t *testing.T) {
 	ao, bo := new(int64), new(int64)
 	kf.Scan(key, ao, bo)
 	assert.Equal(t, a, *ao)
-	assert.Equal(t, int64(b), *bo)
+	assert.Equal(t, int64(b), *bo) //nolint: gosec // used in testing
 }
 
 func benchmarkKeyFormatBytes(b *testing.B, kf *KeyFormat, segments ...[]byte) {

keyformat/prefix_formatter.go

@@ -29,7 +29,7 @@ func (f *FastPrefixFormatter) Scan(key []byte, a interface{}) {
 func (f *FastPrefixFormatter) KeyInt64(bz int64) []byte {
 	key := make([]byte, 1+f.length)
 	key[0] = f.prefix
-	binary.BigEndian.PutUint64(key[1:], uint64(bz))
+	binary.BigEndian.PutUint64(key[1:], uint64(bz)) // nolint:gosec // the integer version is always positive
 	return key
 }