bump tools/golangci-lint to v2

v2 has a fix for missing dependency github.com/tdakkota/asciicheck which
break the build of v1 if GOPROXY is not used (where it is cached).

Author: starius

.golangci.yml

@@ -1,106 +1,122 @@
+version: "2"
 run:
-  # timeout for analysis
-  timeout: 4m
   go: "1.23"
+linters:
+  default: all
+  disable:
+    # Global variables are used in many places throughout the code base.
+    - gochecknoglobals
 
-linters-settings:
-  lll:
-    line-length: 80
-  govet:
-    # Don't report about shadowed variables
-    shadow: false
-  gofmt:
-    # simplify code: gofmt with `-s` option, true by default
-    simplify: true
-  tagliatelle:
-    case:
-      rules:
-        json: snake
-  whitespace:
-    multi-func: true
-    multi-if: true
-  gosec:
-    excludes:
-      - G402 # Look for bad TLS connection settings.
-      - G306 # Poor file permissions used when writing to a new file.
-      - G115 # Integer overflow conversion.
-  staticcheck:
-    checks: ["-SA1019"]
-  revive:
-    rules:
-      - name: exported # To enforce conventions around exported comments.
+    # We want to allow short variable names.
+    - varnamelen
 
-issues:
-  include:
-    - EXC0012 # revive: Exported vars should have a docstring.
-    - EXC0014 # revive: Exported vars's docstring should start with its name.
+    # We want to allow TODOs.
+    - godox
 
-linters:
-  enable-all: true
-  disable:
-  # Global variables are used in many places throughout the code base.
-  - gochecknoglobals
+    # We have long functions, especially in tests. Moving or renaming those would
+    # trigger funlen problems that we may not want to solve at that time.
+    - funlen
 
-  # We want to allow short variable names.
-  - varnamelen
+    # Disable for now as we haven't yet tuned the sensitivity to our codebase
+    # yet. Enabling by default for example, would also force new contributors to
+    # potentially extensively refactor code, when they want to smaller change to
+    # land.
+    - gocyclo
+    - gocognit
+    - cyclop
 
-  # We want to allow TODOs.
-  - godox
+    # Instances of table driven tests that don't pre-allocate shouldn't trigger
+    # the linter.
+    - prealloc
 
-  # We have long functions, especially in tests. Moving or renaming those would
-  # trigger funlen problems that we may not want to solve at that time.
-  - funlen
+    # Init functions are used by loggers throughout the codebase.
+    - gochecknoinits
 
-  # Disable for now as we haven't yet tuned the sensitivity to our codebase
-  # yet. Enabling by default for example, would also force new contributors to
-  # potentially extensively refactor code, when they want to smaller change to
-  # land.
-  - gocyclo
-  - gocognit
-  - cyclop
+    # Causes stack overflow, see https://github.com/polyfloyd/go-errorlint/issues/19.
+    - errorlint
 
-  # Instances of table driven tests that don't pre-allocate shouldn't trigger
-  # the linter.
-  - prealloc
+    # Don't forbid an empty line after function signature. We add it in multi-line case.
+    - wsl_v5
 
-  # Init functions are used by loggers throughout the codebase.
-  - gochecknoinits
+    # Don't forbid "if err := ...; err != nil" checks.
+    - noinlineerr
 
-  # Causes stack overflow, see https://github.com/polyfloyd/go-errorlint/issues/19.
-  - errorlint
+    # Don't demand any particular functions order.
+    - funcorder
 
-  # New linters that need a code adjustment first.
-  - wrapcheck
-  - nolintlint
-  - paralleltest
-  - tparallel
-  - testpackage
-  - gofumpt
-  - gomoddirectives
-  - ireturn
-  - maintidx
-  - nlreturn
-  - dogsled
-  - gci
-  - containedctx
-  - contextcheck
-  - errname
-  - err113
-  - mnd
-  - noctx
-  - nestif
-  - wsl
-  - exhaustive
-  - forcetypeassert
-  - nilerr
-  - nilnil
-  - stylecheck
-  - thelper
-  - exhaustruct
-  - importas
-  - interfacebloat
-  - protogetter
-  - depguard
-  - mnd
-  - perfsprint
-  - inamedparam
+    # New linters that need a code adjustment first.
+    - containedctx
+    - contextcheck
+    - depguard
+    - dogsled
+    - err113
+    - errname
+    - exhaustive
+    - exhaustruct
+    - forcetypeassert
+    - gomoddirectives
+    - importas
+    - inamedparam
+    - interfacebloat
+    - ireturn
+    - maintidx
+    - mnd
+    - nestif
+    - nilerr
+    - nilnil
+    - nlreturn
+    - noctx
+    - nolintlint
+    - paralleltest
+    - perfsprint
+    - protogetter
+    - testpackage
+    - thelper
+    - tparallel
+    - wrapcheck
+    - wsl
+  settings:
+    gosec:
+      excludes:
+        - G402 # Look for bad TLS connection settings.
+        - G306 # Poor file permissions used when writing to a new file.
+        - G115 # Integer overflow conversion.
+    lll:
+      line-length: 80
+    revive:
+      rules:
+        - name: exported # To enforce conventions around exported comments.
+    staticcheck:
+      checks:
+        - -SA1019
+    tagliatelle:
+      case:
+        rules:
+          json: snake
+    whitespace:
+      multi-if: true
+      multi-func: true
+  exclusions:
+    generated: lax
+    presets:
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gofmt:
+      # simplify code: gofmt with `-s` option, true by default
+      simplify: true
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

lnd_services_test.go

@@ -175,6 +175,7 @@ func TestLndVersionCheckComparison(t *testing.T) {
 type lockLNDMock struct {
 	lnrpc.LightningClient
 	StateClient
+
 	callCount int
 	errors    []error
 	stateErr  error

macaroon_service.go

@@ -54,9 +54,9 @@ var (
 // It is also a wrapper for a macaroon.Service and uses this to create a
 // default macaroon for the caller if stateless mode has not been specified.
 type MacaroonService struct {
-	cfg *MacaroonServiceConfig
-
 	*macaroons.Service
+
+	cfg *MacaroonServiceConfig
 }
 
 // MacaroonServiceConfig holds configuration values used by the MacaroonService.

macaroon_service_test.go

@@ -246,6 +246,7 @@ func TestMacaroonGeneration(t *testing.T) {
 
 type testMacaroonService struct {
 	*macaroons.Service
+
 	rks bakery.RootKeyStore
 }
 
@@ -284,9 +285,9 @@ func (s *testMacaroonService) stop() error {
 }
 
 type mockSignerClient struct {
-	sharedKey []byte
-
 	SignerClient
+
+	sharedKey []byte
 }
 
 func (m *mockSignerClient) DeriveSharedKey(_ context.Context,

tools/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23.6-bookworm
+FROM golang:1.24.6-bookworm
 
 RUN apt-get update && apt-get install -y git
 ENV GOCACHE=/tmp/build/.cache
@@ -11,7 +11,8 @@ RUN cd /tmp \
   && mkdir -p /tmp/build/.cache \
   && mkdir -p /tmp/build/.modcache \
   && cd /tmp/tools \
-  && go install -trimpath github.com/golangci/golangci-lint/cmd/golangci-lint \
+  && go install -trimpath \
+        github.com/golangci/golangci-lint/v2/cmd/golangci-lint \
   && chmod -R 777 /tmp/build/
 
 WORKDIR /build