Skip to content

Commit 76ebee9

Browse files
stariusguggero
authored andcommitted
golangci: update to 1.59
Update the image used to build to golang:1.22.3-bookworm. Updated the config: removed the linters that were removed, added new unconfigured linters creating a lot of noice, fixed one linter warning that made sense.
1 parent 983e567 commit 76ebee9

File tree

5 files changed

+384
-387
lines changed

5 files changed

+384
-387
lines changed

.golangci.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
run:
22
# timeout for analysis
3-
deadline: 4m
3+
timeout: 4m
44

55
linters-settings:
66
govet:
@@ -20,7 +20,7 @@ linters-settings:
2020
excludes:
2121
- G402 # Look for bad TLS connection settings.
2222
- G306 # Poor file permissions used when writing to a new file.
23-
staticcheck:
23+
staticcheck:
2424
go: "1.18"
2525
checks: ["-SA1019"]
2626

@@ -58,20 +58,10 @@ linters:
5858

5959
# Init functions are used by loggers throughout the codebase.
6060
- gochecknoinits
61-
61+
6262
# Causes stack overflow, see https://github.com/polyfloyd/go-errorlint/issues/19.
6363
- errorlint
6464

65-
# Deprecated linters. See https://golangci-lint.run/usage/linters/.
66-
- interfacer
67-
- golint
68-
- maligned
69-
- scopelint
70-
- varcheck
71-
- nosnakecase
72-
- structcheck
73-
- deadcode
74-
7565
# New linters that need a code adjustment first.
7666
- wrapcheck
7767
- nolintlint
@@ -88,10 +78,8 @@ linters:
8878
- containedctx
8979
- contextcheck
9080
- errname
91-
- exhaustivestruct
92-
- goerr113
81+
- err113
9382
- gomnd
94-
- ifshort
9583
- noctx
9684
- nestif
9785
- wsl
@@ -104,4 +92,12 @@ linters:
10492
- exhaustruct
10593
- importas
10694
- interfacebloat
95+
- protogetter
96+
- revive
97+
- depguard
98+
- mnd
99+
- perfsprint
100+
- inamedparam
107101

102+
# Disabled disabled because the Go version (1.21.4) of the project < 1.22.
103+
- copyloopvar

lnd_services_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ func TestGetLndInfo(t *testing.T) {
319319
require.Error(t, err)
320320

321321
// Error might be wrapped.
322-
require.True(t, errors.Is(err, test.expected))
322+
require.ErrorIs(t, err, test.expected)
323323
}
324324
})
325325
}

tools/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19.4-buster
1+
FROM golang:1.22.3-bookworm
22

33
RUN apt-get update && apt-get install -y git
44
ENV GOCACHE=/tmp/build/.cache

tools/go.mod

Lines changed: 112 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,182 +1,195 @@
11
module github.com/lightninglabs/lndclient/tools
22

3-
go 1.19
3+
go 1.21
4+
5+
toolchain go1.22.3
46

57
require (
6-
github.com/golangci/golangci-lint v1.51.2
8+
github.com/golangci/golangci-lint v1.59.0
79
github.com/rinchsan/gosimports v0.1.5
810
)
911

1012
require (
1113
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
1214
4d63.com/gochecknoglobals v0.2.1 // indirect
13-
github.com/Abirdcfly/dupword v0.0.9 // indirect
14-
github.com/Antonboom/errname v0.1.7 // indirect
15-
github.com/Antonboom/nilnil v0.1.1 // indirect
16-
github.com/BurntSushi/toml v1.2.1 // indirect
15+
github.com/4meepo/tagalign v1.3.4 // indirect
16+
github.com/Abirdcfly/dupword v0.0.14 // indirect
17+
github.com/Antonboom/errname v0.1.13 // indirect
18+
github.com/Antonboom/nilnil v0.1.9 // indirect
19+
github.com/Antonboom/testifylint v1.3.0 // indirect
20+
github.com/BurntSushi/toml v1.4.0 // indirect
21+
github.com/Crocmagnon/fatcontext v0.2.2 // indirect
1722
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
18-
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
19-
github.com/Masterminds/semver v1.5.0 // indirect
20-
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
23+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
24+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
25+
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
26+
github.com/alecthomas/go-check-sumtype v0.1.4 // indirect
27+
github.com/alexkohler/nakedret/v2 v2.0.4 // indirect
2128
github.com/alexkohler/prealloc v1.0.0 // indirect
2229
github.com/alingse/asasalint v0.0.11 // indirect
23-
github.com/ashanbrown/forbidigo v1.4.0 // indirect
30+
github.com/ashanbrown/forbidigo v1.6.0 // indirect
2431
github.com/ashanbrown/makezero v1.1.1 // indirect
2532
github.com/beorn7/perks v1.0.1 // indirect
26-
github.com/bkielbasa/cyclop v1.2.0 // indirect
33+
github.com/bkielbasa/cyclop v1.2.1 // indirect
2734
github.com/blizzy78/varnamelen v0.8.0 // indirect
28-
github.com/bombsimon/wsl/v3 v3.4.0 // indirect
29-
github.com/breml/bidichk v0.2.3 // indirect
30-
github.com/breml/errchkjson v0.3.0 // indirect
31-
github.com/butuzov/ireturn v0.1.1 // indirect
35+
github.com/bombsimon/wsl/v4 v4.2.1 // indirect
36+
github.com/breml/bidichk v0.2.7 // indirect
37+
github.com/breml/errchkjson v0.3.6 // indirect
38+
github.com/butuzov/ireturn v0.3.0 // indirect
39+
github.com/butuzov/mirror v1.2.0 // indirect
40+
github.com/catenacyber/perfsprint v0.7.1 // indirect
41+
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
3242
github.com/cespare/xxhash/v2 v2.1.2 // indirect
33-
github.com/charithe/durationcheck v0.0.9 // indirect
34-
github.com/chavacava/garif v0.0.0-20221024190013-b3ef35877348 // indirect
43+
github.com/charithe/durationcheck v0.0.10 // indirect
44+
github.com/chavacava/garif v0.1.0 // indirect
45+
github.com/ckaznocha/intrange v0.1.2 // indirect
3546
github.com/curioswitch/go-reassign v0.2.0 // indirect
36-
github.com/daixiang0/gci v0.9.1 // indirect
47+
github.com/daixiang0/gci v0.13.4 // indirect
3748
github.com/davecgh/go-spew v1.1.1 // indirect
38-
github.com/denis-tingaikin/go-header v0.4.3 // indirect
39-
github.com/esimonov/ifshort v1.0.4 // indirect
40-
github.com/ettle/strcase v0.1.1 // indirect
41-
github.com/fatih/color v1.14.1 // indirect
49+
github.com/denis-tingaikin/go-header v0.5.0 // indirect
50+
github.com/ettle/strcase v0.2.0 // indirect
51+
github.com/fatih/color v1.17.0 // indirect
4252
github.com/fatih/structtag v1.2.0 // indirect
43-
github.com/firefart/nonamedreturns v1.0.4 // indirect
53+
github.com/firefart/nonamedreturns v1.0.5 // indirect
4454
github.com/fsnotify/fsnotify v1.5.4 // indirect
4555
github.com/fzipp/gocyclo v0.6.0 // indirect
46-
github.com/go-critic/go-critic v0.6.7 // indirect
56+
github.com/ghostiam/protogetter v0.3.6 // indirect
57+
github.com/go-critic/go-critic v0.11.4 // indirect
4758
github.com/go-toolsmith/astcast v1.1.0 // indirect
48-
github.com/go-toolsmith/astcopy v1.0.3 // indirect
49-
github.com/go-toolsmith/astequal v1.1.0 // indirect
59+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
60+
github.com/go-toolsmith/astequal v1.2.0 // indirect
5061
github.com/go-toolsmith/astfmt v1.1.0 // indirect
5162
github.com/go-toolsmith/astp v1.1.0 // indirect
5263
github.com/go-toolsmith/strparse v1.1.0 // indirect
5364
github.com/go-toolsmith/typep v1.1.0 // indirect
65+
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
5466
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
5567
github.com/gobwas/glob v0.2.3 // indirect
5668
github.com/gofrs/flock v0.8.1 // indirect
57-
github.com/golang/protobuf v1.5.2 // indirect
58-
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
69+
github.com/golang/protobuf v1.5.3 // indirect
5970
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
60-
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
61-
github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect
62-
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
63-
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
64-
github.com/golangci/misspell v0.4.0 // indirect
65-
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
66-
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
67-
github.com/google/go-cmp v0.5.9 // indirect
68-
github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 // indirect
71+
github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect
72+
github.com/golangci/misspell v0.5.1 // indirect
73+
github.com/golangci/modinfo v0.3.4 // indirect
74+
github.com/golangci/plugin-module-register v0.1.1 // indirect
75+
github.com/golangci/revgrep v0.5.3 // indirect
76+
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
77+
github.com/google/go-cmp v0.6.0 // indirect
78+
github.com/gordonklaus/ineffassign v0.1.0 // indirect
6979
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
7080
github.com/gostaticanalysis/comment v1.4.2 // indirect
7181
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
7282
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
73-
github.com/hashicorp/errwrap v1.0.0 // indirect
74-
github.com/hashicorp/go-multierror v1.1.1 // indirect
75-
github.com/hashicorp/go-version v1.6.0 // indirect
83+
github.com/hashicorp/go-version v1.7.0 // indirect
7684
github.com/hashicorp/hcl v1.0.0 // indirect
7785
github.com/hexops/gotextdiff v1.0.3 // indirect
78-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
79-
github.com/jgautheron/goconst v1.5.1 // indirect
86+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
87+
github.com/jgautheron/goconst v1.7.1 // indirect
8088
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
8189
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
90+
github.com/jjti/go-spancheck v0.6.1 // indirect
8291
github.com/julz/importas v0.1.0 // indirect
83-
github.com/junk1tm/musttag v0.4.5 // indirect
84-
github.com/kisielk/errcheck v1.6.3 // indirect
85-
github.com/kisielk/gotool v1.0.0 // indirect
86-
github.com/kkHAIKE/contextcheck v1.1.3 // indirect
92+
github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
93+
github.com/kisielk/errcheck v1.7.0 // indirect
94+
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
8795
github.com/kulti/thelper v0.6.3 // indirect
88-
github.com/kunwardeep/paralleltest v1.0.6 // indirect
96+
github.com/kunwardeep/paralleltest v1.0.10 // indirect
8997
github.com/kyoh86/exportloopref v0.1.11 // indirect
90-
github.com/ldez/gomoddirectives v0.2.3 // indirect
91-
github.com/ldez/tagliatelle v0.4.0 // indirect
92-
github.com/leonklingele/grouper v1.1.1 // indirect
98+
github.com/lasiar/canonicalheader v1.1.1 // indirect
99+
github.com/ldez/gomoddirectives v0.2.4 // indirect
100+
github.com/ldez/tagliatelle v0.5.0 // indirect
101+
github.com/leonklingele/grouper v1.1.2 // indirect
93102
github.com/lufeee/execinquery v1.2.1 // indirect
103+
github.com/macabu/inamedparam v0.1.3 // indirect
94104
github.com/magiconair/properties v1.8.6 // indirect
95105
github.com/maratori/testableexamples v1.0.0 // indirect
96-
github.com/maratori/testpackage v1.1.0 // indirect
97-
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
106+
github.com/maratori/testpackage v1.1.1 // indirect
107+
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
98108
github.com/mattn/go-colorable v0.1.13 // indirect
99-
github.com/mattn/go-isatty v0.0.17 // indirect
109+
github.com/mattn/go-isatty v0.0.20 // indirect
100110
github.com/mattn/go-runewidth v0.0.9 // indirect
101111
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
102-
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
103-
github.com/mgechev/revive v1.2.5 // indirect
112+
github.com/mgechev/revive v1.3.7 // indirect
104113
github.com/mitchellh/go-homedir v1.1.0 // indirect
105114
github.com/mitchellh/mapstructure v1.5.0 // indirect
106-
github.com/moricho/tparallel v0.2.1 // indirect
115+
github.com/moricho/tparallel v0.3.1 // indirect
107116
github.com/nakabonne/nestif v0.3.1 // indirect
108-
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
109-
github.com/nishanths/exhaustive v0.9.5 // indirect
117+
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
118+
github.com/nishanths/exhaustive v0.12.0 // indirect
110119
github.com/nishanths/predeclared v0.2.2 // indirect
111-
github.com/nunnatsa/ginkgolinter v0.8.1 // indirect
120+
github.com/nunnatsa/ginkgolinter v0.16.2 // indirect
112121
github.com/olekukonko/tablewriter v0.0.5 // indirect
113122
github.com/pelletier/go-toml v1.9.5 // indirect
114-
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
115-
github.com/pkg/errors v0.9.1 // indirect
123+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
116124
github.com/pmezard/go-difflib v1.0.0 // indirect
117-
github.com/polyfloyd/go-errorlint v1.1.0 // indirect
125+
github.com/polyfloyd/go-errorlint v1.5.1 // indirect
118126
github.com/prometheus/client_golang v1.12.1 // indirect
119127
github.com/prometheus/client_model v0.2.0 // indirect
120128
github.com/prometheus/common v0.32.1 // indirect
121129
github.com/prometheus/procfs v0.7.3 // indirect
122-
github.com/quasilyte/go-ruleguard v0.3.19 // indirect
130+
github.com/quasilyte/go-ruleguard v0.4.2 // indirect
131+
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
123132
github.com/quasilyte/gogrep v0.5.0 // indirect
124-
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
133+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
125134
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
126-
github.com/ryancurrah/gomodguard v1.3.0 // indirect
127-
github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect
135+
github.com/ryancurrah/gomodguard v1.3.2 // indirect
136+
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
128137
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
138+
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
129139
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
130-
github.com/sashamelentyev/usestdlibvars v1.23.0 // indirect
131-
github.com/securego/gosec/v2 v2.15.0 // indirect
140+
github.com/sashamelentyev/usestdlibvars v1.25.0 // indirect
141+
github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 // indirect
132142
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
133-
github.com/sirupsen/logrus v1.9.0 // indirect
134-
github.com/sivchari/containedctx v1.0.2 // indirect
135-
github.com/sivchari/nosnakecase v1.7.0 // indirect
143+
github.com/sirupsen/logrus v1.9.3 // indirect
144+
github.com/sivchari/containedctx v1.0.3 // indirect
136145
github.com/sivchari/tenv v1.7.1 // indirect
137-
github.com/sonatard/noctx v0.0.1 // indirect
146+
github.com/sonatard/noctx v0.0.2 // indirect
138147
github.com/sourcegraph/go-diff v0.7.0 // indirect
139-
github.com/spf13/afero v1.8.2 // indirect
148+
github.com/spf13/afero v1.11.0 // indirect
140149
github.com/spf13/cast v1.5.0 // indirect
141-
github.com/spf13/cobra v1.6.1 // indirect
150+
github.com/spf13/cobra v1.7.0 // indirect
142151
github.com/spf13/jwalterweatherman v1.1.0 // indirect
143152
github.com/spf13/pflag v1.0.5 // indirect
144153
github.com/spf13/viper v1.12.0 // indirect
145154
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
146155
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
147-
github.com/stretchr/objx v0.5.0 // indirect
148-
github.com/stretchr/testify v1.8.1 // indirect
156+
github.com/stretchr/objx v0.5.2 // indirect
157+
github.com/stretchr/testify v1.9.0 // indirect
149158
github.com/subosito/gotenv v1.4.1 // indirect
150159
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
151-
github.com/tdakkota/asciicheck v0.1.1 // indirect
152-
github.com/tetafro/godot v1.4.11 // indirect
153-
github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e // indirect
154-
github.com/timonwong/loggercheck v0.9.3 // indirect
155-
github.com/tomarrell/wrapcheck/v2 v2.8.0 // indirect
160+
github.com/tdakkota/asciicheck v0.2.0 // indirect
161+
github.com/tetafro/godot v1.4.16 // indirect
162+
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
163+
github.com/timonwong/loggercheck v0.9.4 // indirect
164+
github.com/tomarrell/wrapcheck/v2 v2.8.3 // indirect
156165
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
157-
github.com/ultraware/funlen v0.0.3 // indirect
158-
github.com/ultraware/whitespace v0.0.5 // indirect
159-
github.com/uudashr/gocognit v1.0.6 // indirect
166+
github.com/ultraware/funlen v0.1.0 // indirect
167+
github.com/ultraware/whitespace v0.1.1 // indirect
168+
github.com/uudashr/gocognit v1.1.2 // indirect
169+
github.com/xen0n/gosmopolitan v1.2.2 // indirect
160170
github.com/yagipy/maintidx v1.0.0 // indirect
161-
github.com/yeya24/promlinter v0.2.0 // indirect
162-
gitlab.com/bosi/decorder v0.2.3 // indirect
171+
github.com/yeya24/promlinter v0.3.0 // indirect
172+
github.com/ykadowak/zerologlint v0.1.5 // indirect
173+
gitlab.com/bosi/decorder v0.4.2 // indirect
174+
go-simpler.org/musttag v0.12.2 // indirect
175+
go-simpler.org/sloglint v0.7.0 // indirect
163176
go.uber.org/atomic v1.7.0 // indirect
177+
go.uber.org/automaxprocs v1.5.3 // indirect
164178
go.uber.org/multierr v1.6.0 // indirect
165-
go.uber.org/zap v1.17.0 // indirect
166-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
167-
golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9 // indirect
168-
golang.org/x/mod v0.8.0 // indirect
169-
golang.org/x/sync v0.1.0 // indirect
170-
golang.org/x/sys v0.5.0 // indirect
171-
golang.org/x/text v0.6.0 // indirect
172-
golang.org/x/tools v0.6.0 // indirect
179+
go.uber.org/zap v1.24.0 // indirect
180+
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
181+
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
182+
golang.org/x/mod v0.17.0 // indirect
183+
golang.org/x/sync v0.7.0 // indirect
184+
golang.org/x/sys v0.20.0 // indirect
185+
golang.org/x/text v0.15.0 // indirect
186+
golang.org/x/tools v0.21.0 // indirect
173187
google.golang.org/protobuf v1.33.0 // indirect
188+
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
174189
gopkg.in/ini.v1 v1.67.0 // indirect
175190
gopkg.in/yaml.v2 v2.4.0 // indirect
176191
gopkg.in/yaml.v3 v3.0.1 // indirect
177-
honnef.co/go/tools v0.4.2 // indirect
178-
mvdan.cc/gofumpt v0.4.0 // indirect
179-
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
180-
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
181-
mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect
192+
honnef.co/go/tools v0.4.7 // indirect
193+
mvdan.cc/gofumpt v0.6.0 // indirect
194+
mvdan.cc/unparam v0.0.0-20240427195214-063aff900ca1 // indirect
182195
)

0 commit comments

Comments
 (0)