update golangci-lint

pk910 · pk910 · commit 3490df5c1e25 · 2024-07-03T21:51:21.000+02:00
diff --git a/.github/workflows/_shared-check.yaml b/.github/workflows/_shared-check.yaml
@@ -36,7 +36,7 @@ jobs:
       uses: golangci/golangci-lint-action@v3
       with:
         # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-        version: v1.56.1
+        version: v1.59.1
 
         # Optional: working directory, useful for monorepos
         # working-directory: somedir
diff --git a/.golangci.yml b/.golangci.yml
@@ -12,7 +12,8 @@ linters-settings:
       - performance
       - style
   govet:
-    check-shadowing: true
+    enable:
+      - shadow
   nolintlint:
     require-explanation: true
     require-specific: true
@@ -21,7 +22,6 @@ linters:
   disable-all: true
   enable:
     - bodyclose
-    - deadcode
     - dogsled
     - dupl
     - errcheck
@@ -42,14 +42,13 @@ linters:
     - prealloc
     - revive
     - staticcheck
-    - structcheck
     - stylecheck
     - thelper
     - tparallel
     - typecheck
     - unconvert
     - unparam
-    - varcheck
+    - unused
     - whitespace
     - wsl
 
diff --git a/pkg/coordinator/clients/consensus/subscriptions.go b/pkg/coordinator/clients/consensus/subscriptions.go
@@ -3,16 +3,12 @@ package consensus
 import "sync"
 
 type Subscription[T interface{}] struct {
-	//nolint:structcheck // linter bug with generic struct
-	channel chan T
-	//nolint:structcheck // linter bug with generic struct
+	channel    chan T
 	dispatcher *Dispatcher[T]
 }
 
 type Dispatcher[T interface{}] struct {
-	//nolint:structcheck // linter bug with generic struct
-	mutex sync.Mutex
-	//nolint:structcheck // linter bug with generic struct
+	mutex         sync.Mutex
 	subscriptions []*Subscription[T]
 }
 
diff --git a/pkg/coordinator/clients/execution/subscriptions.go b/pkg/coordinator/clients/execution/subscriptions.go
@@ -3,16 +3,12 @@ package execution
 import "sync"
 
 type Subscription[T interface{}] struct {
-	//nolint:structcheck // linter bug with generic struct
-	channel chan T
-	//nolint:structcheck // linter bug with generic struct
+	channel    chan T
 	dispatcher *Dispatcher[T]
 }
 
 type Dispatcher[T interface{}] struct {
-	//nolint:structcheck // linter bug with generic struct
-	mutex sync.Mutex
-	//nolint:structcheck // linter bug with generic struct
+	mutex         sync.Mutex
 	subscriptions []*Subscription[T]
 }
 
diff --git a/pkg/coordinator/wallet/blobtx/blob_encode.go b/pkg/coordinator/wallet/blobtx/blob_encode.go
@@ -26,12 +26,12 @@ func encodeBlobData(data []byte) kzg4844.Blob {
 			break
 		}
 
-		max := i + 31
-		if max > len(data) {
-			max = len(data)
+		maxpos := i + 31
+		if maxpos > len(data) {
+			maxpos = len(data)
 		}
 
-		copy(blob[fieldIndex*32+1:], data[i:max])
+		copy(blob[fieldIndex*32+1:], data[i:maxpos])
 	}
 
 	return blob

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@ func encodeBlobData(data []byte) kzg4844.Blob {`
`26`	`26`	`break`
`27`	`27`	`}`
`28`	`28`
`29`		`- max := i + 31`
`30`		`- if max > len(data) {`
`31`		`- max = len(data)`
	`29`	`+ maxpos := i + 31`
	`30`	`+ if maxpos > len(data) {`
	`31`	`+ maxpos = len(data)`
`32`	`32`	`}`
`33`	`33`
`34`		`- copy(blob[fieldIndex*32+1:], data[i:max])`
	`34`	`+ copy(blob[fieldIndex*32+1:], data[i:maxpos])`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`return blob`