Skip to content

Commit 7a42fe1

Browse files
committed
multi: bump and adjust linter, fix issues
Not strictly necessary to fix the linter issues caused by the version bump, but nice to have.
1 parent b86d458 commit 7a42fe1

File tree

5 files changed

+349
-311
lines changed

5 files changed

+349
-311
lines changed

.golangci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ linters:
2020
# the latest linter includes many sub-linters which do not pass the codebase.
2121
enable:
2222
- bodyclose
23-
- deadcode
24-
- depguard
2523
- dupl
2624
- errcheck
25+
- exportloopref
2726
- goconst
2827
- gocritic
2928
- gocyclo
@@ -33,16 +32,18 @@ linters:
3332
- gosimple
3433
- govet
3534
- ineffassign
36-
- interfacer
3735
- misspell
3836
- nakedret
3937
- prealloc
40-
- scopelint
4138
- staticcheck
42-
- structcheck
4339
- stylecheck
4440
- typecheck
4541
- unconvert
4642
- unparam
4743
- unused
48-
- varcheck
44+
45+
issues:
46+
exclude-rules:
47+
- path: internal/test
48+
linters:
49+
- goconst

mint/mock_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package mint
22

33
import (
44
"context"
5+
"crypto/rand"
56
"crypto/sha256"
6-
"math/rand"
77

88
"github.com/lightninglabs/aperture/lsat"
99
"github.com/lightningnetwork/lnd/lntypes"

tools/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
FROM golang:1.19.2-buster
1+
FROM golang:1.21.4-bookworm
22

33
RUN apt-get update && apt-get install -y git
44
ENV GOCACHE=/tmp/build/.cache
55
ENV GOMODCACHE=/tmp/build/.modcache
6+
ENV GOFLAGS="-buildvcs=false"
67

78
COPY . /tmp/tools
89

910
RUN cd /tmp \
1011
&& mkdir -p /tmp/build/.cache \
1112
&& mkdir -p /tmp/build/.modcache \
1213
&& cd /tmp/tools \
13-
&& go install -trimpath -tags=tools github.com/golangci/golangci-lint/cmd/golangci-lint \
14-
&& chmod -R 777 /tmp/build/ \
15-
&& git config --global --add safe.directory /build
14+
&& go install -trimpath github.com/golangci/golangci-lint/cmd/golangci-lint \
15+
&& chmod -R 777 /tmp/build/
1616

1717
WORKDIR /build

tools/go.mod

Lines changed: 100 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,83 @@
11
module github.com/lightninglabs/aperture/tools
22

3-
go 1.19
3+
go 1.21
44

55
require (
6-
github.com/golangci/golangci-lint v1.50.1
6+
github.com/golangci/golangci-lint v1.55.2
77
github.com/ory/go-acc v0.2.6
88
github.com/rinchsan/gosimports v0.1.5
99
)
1010

1111
require (
12-
4d63.com/gochecknoglobals v0.1.0 // indirect
13-
github.com/Abirdcfly/dupword v0.0.7 // 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
12+
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
13+
4d63.com/gochecknoglobals v0.2.1 // indirect
14+
github.com/4meepo/tagalign v1.3.3 // indirect
15+
github.com/Abirdcfly/dupword v0.0.13 // indirect
16+
github.com/Antonboom/errname v0.1.12 // indirect
17+
github.com/Antonboom/nilnil v0.1.7 // indirect
18+
github.com/Antonboom/testifylint v0.2.3 // indirect
19+
github.com/BurntSushi/toml v1.3.2 // indirect
1720
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
18-
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
21+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0 // indirect
1922
github.com/Masterminds/semver v1.5.0 // indirect
20-
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
23+
github.com/OpenPeeDeeP/depguard/v2 v2.1.0 // indirect
24+
github.com/alecthomas/go-check-sumtype v0.1.3 // indirect
25+
github.com/alexkohler/nakedret/v2 v2.0.2 // indirect
2126
github.com/alexkohler/prealloc v1.0.0 // indirect
2227
github.com/alingse/asasalint v0.0.11 // indirect
23-
github.com/ashanbrown/forbidigo v1.3.0 // indirect
28+
github.com/ashanbrown/forbidigo v1.6.0 // indirect
2429
github.com/ashanbrown/makezero v1.1.1 // indirect
2530
github.com/beorn7/perks v1.0.1 // indirect
26-
github.com/bkielbasa/cyclop v1.2.0 // indirect
31+
github.com/bkielbasa/cyclop v1.2.1 // indirect
2732
github.com/blizzy78/varnamelen v0.8.0 // indirect
28-
github.com/bombsimon/wsl/v3 v3.3.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
33+
github.com/bombsimon/wsl/v3 v3.4.0 // indirect
34+
github.com/breml/bidichk v0.2.7 // indirect
35+
github.com/breml/errchkjson v0.3.6 // indirect
36+
github.com/butuzov/ireturn v0.2.2 // indirect
37+
github.com/butuzov/mirror v1.1.0 // indirect
38+
github.com/catenacyber/perfsprint v0.2.0 // indirect
39+
github.com/ccojocar/zxcvbn-go v1.0.1 // indirect
3240
github.com/cespare/xxhash v1.1.0 // indirect
3341
github.com/cespare/xxhash/v2 v2.1.2 // indirect
34-
github.com/charithe/durationcheck v0.0.9 // indirect
35-
github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
42+
github.com/charithe/durationcheck v0.0.10 // indirect
43+
github.com/chavacava/garif v0.1.0 // indirect
3644
github.com/curioswitch/go-reassign v0.2.0 // indirect
37-
github.com/daixiang0/gci v0.8.1 // indirect
45+
github.com/daixiang0/gci v0.11.2 // indirect
3846
github.com/davecgh/go-spew v1.1.1 // indirect
3947
github.com/denis-tingaikin/go-header v0.4.3 // indirect
4048
github.com/dgraph-io/ristretto v0.0.2 // indirect
4149
github.com/esimonov/ifshort v1.0.4 // indirect
4250
github.com/ettle/strcase v0.1.1 // indirect
43-
github.com/fatih/color v1.13.0 // indirect
51+
github.com/fatih/color v1.15.0 // indirect
4452
github.com/fatih/structtag v1.2.0 // indirect
4553
github.com/firefart/nonamedreturns v1.0.4 // indirect
4654
github.com/fsnotify/fsnotify v1.5.4 // indirect
4755
github.com/fzipp/gocyclo v0.6.0 // indirect
48-
github.com/go-critic/go-critic v0.6.5 // indirect
49-
github.com/go-toolsmith/astcast v1.0.0 // indirect
50-
github.com/go-toolsmith/astcopy v1.0.2 // indirect
51-
github.com/go-toolsmith/astequal v1.0.3 // indirect
52-
github.com/go-toolsmith/astfmt v1.0.0 // indirect
53-
github.com/go-toolsmith/astp v1.0.0 // indirect
54-
github.com/go-toolsmith/strparse v1.0.0 // indirect
55-
github.com/go-toolsmith/typep v1.0.2 // indirect
56-
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
56+
github.com/ghostiam/protogetter v0.2.3 // indirect
57+
github.com/go-critic/go-critic v0.9.0 // indirect
58+
github.com/go-toolsmith/astcast v1.1.0 // indirect
59+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
60+
github.com/go-toolsmith/astequal v1.1.0 // indirect
61+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
62+
github.com/go-toolsmith/astp v1.1.0 // indirect
63+
github.com/go-toolsmith/strparse v1.1.0 // indirect
64+
github.com/go-toolsmith/typep v1.1.0 // indirect
65+
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
5766
github.com/gobwas/glob v0.2.3 // indirect
5867
github.com/gofrs/flock v0.8.1 // indirect
5968
github.com/golang/protobuf v1.5.2 // indirect
6069
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
6170
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
6271
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
63-
github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect
72+
github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect
6473
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
6574
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
66-
github.com/golangci/misspell v0.3.5 // indirect
67-
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
75+
github.com/golangci/misspell v0.4.1 // indirect
76+
github.com/golangci/revgrep v0.5.2 // indirect
6877
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
69-
github.com/google/go-cmp v0.5.9 // indirect
70-
github.com/google/uuid v1.3.0 // indirect
71-
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
78+
github.com/google/go-cmp v0.6.0 // indirect
79+
github.com/google/uuid v1.3.1 // indirect
80+
github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 // indirect
7281
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
7382
github.com/gostaticanalysis/comment v1.4.2 // indirect
7483
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
@@ -78,108 +87,112 @@ require (
7887
github.com/hashicorp/go-version v1.6.0 // indirect
7988
github.com/hashicorp/hcl v1.0.0 // indirect
8089
github.com/hexops/gotextdiff v1.0.3 // indirect
81-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
82-
github.com/jgautheron/goconst v1.5.1 // indirect
90+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
91+
github.com/jgautheron/goconst v1.6.0 // indirect
8392
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
8493
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
8594
github.com/julz/importas v0.1.0 // indirect
86-
github.com/kisielk/errcheck v1.6.2 // indirect
95+
github.com/kisielk/errcheck v1.6.3 // indirect
8796
github.com/kisielk/gotool v1.0.0 // indirect
88-
github.com/kkHAIKE/contextcheck v1.1.3 // indirect
97+
github.com/kkHAIKE/contextcheck v1.1.4 // indirect
8998
github.com/kulti/thelper v0.6.3 // indirect
90-
github.com/kunwardeep/paralleltest v1.0.6 // indirect
91-
github.com/kyoh86/exportloopref v0.1.8 // indirect
99+
github.com/kunwardeep/paralleltest v1.0.8 // indirect
100+
github.com/kyoh86/exportloopref v0.1.11 // indirect
92101
github.com/ldez/gomoddirectives v0.2.3 // indirect
93-
github.com/ldez/tagliatelle v0.3.1 // indirect
94-
github.com/leonklingele/grouper v1.1.0 // indirect
102+
github.com/ldez/tagliatelle v0.5.0 // indirect
103+
github.com/leonklingele/grouper v1.1.1 // indirect
95104
github.com/lufeee/execinquery v1.2.1 // indirect
105+
github.com/macabu/inamedparam v0.1.2 // indirect
96106
github.com/magiconair/properties v1.8.6 // indirect
97107
github.com/maratori/testableexamples v1.0.0 // indirect
98-
github.com/maratori/testpackage v1.1.0 // indirect
99-
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
108+
github.com/maratori/testpackage v1.1.1 // indirect
109+
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
100110
github.com/mattn/go-colorable v0.1.13 // indirect
101-
github.com/mattn/go-isatty v0.0.16 // indirect
111+
github.com/mattn/go-isatty v0.0.17 // indirect
102112
github.com/mattn/go-runewidth v0.0.9 // indirect
103113
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
104114
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
105-
github.com/mgechev/revive v1.2.4 // indirect
115+
github.com/mgechev/revive v1.3.4 // indirect
106116
github.com/mitchellh/go-homedir v1.1.0 // indirect
107117
github.com/mitchellh/mapstructure v1.5.0 // indirect
108-
github.com/moricho/tparallel v0.2.1 // indirect
118+
github.com/moricho/tparallel v0.3.1 // indirect
109119
github.com/nakabonne/nestif v0.3.1 // indirect
110-
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
111-
github.com/nishanths/exhaustive v0.8.3 // indirect
120+
github.com/nishanths/exhaustive v0.11.0 // indirect
112121
github.com/nishanths/predeclared v0.2.2 // indirect
122+
github.com/nunnatsa/ginkgolinter v0.14.1 // indirect
113123
github.com/olekukonko/tablewriter v0.0.5 // indirect
114124
github.com/ory/viper v1.7.5 // indirect
115125
github.com/pborman/uuid v1.2.0 // indirect
116126
github.com/pelletier/go-toml v1.9.5 // indirect
117127
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
118-
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
119-
github.com/pkg/errors v0.9.1 // indirect
120128
github.com/pmezard/go-difflib v1.0.0 // indirect
121-
github.com/polyfloyd/go-errorlint v1.0.5 // indirect
129+
github.com/polyfloyd/go-errorlint v1.4.5 // indirect
122130
github.com/prometheus/client_golang v1.12.1 // indirect
123131
github.com/prometheus/client_model v0.2.0 // indirect
124132
github.com/prometheus/common v0.32.1 // indirect
125133
github.com/prometheus/procfs v0.7.3 // indirect
126-
github.com/quasilyte/go-ruleguard v0.3.18 // indirect
127-
github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f // indirect
128-
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
134+
github.com/quasilyte/go-ruleguard v0.4.0 // indirect
135+
github.com/quasilyte/gogrep v0.5.0 // indirect
136+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
129137
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
130-
github.com/ryancurrah/gomodguard v1.2.4 // indirect
131-
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
132-
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
138+
github.com/ryancurrah/gomodguard v1.3.0 // indirect
139+
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
140+
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
133141
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
134-
github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect
135-
github.com/securego/gosec/v2 v2.13.1 // indirect
142+
github.com/sashamelentyev/usestdlibvars v1.24.0 // indirect
143+
github.com/securego/gosec/v2 v2.18.2 // indirect
136144
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
137-
github.com/sirupsen/logrus v1.9.0 // indirect
138-
github.com/sivchari/containedctx v1.0.2 // indirect
145+
github.com/sirupsen/logrus v1.9.3 // indirect
146+
github.com/sivchari/containedctx v1.0.3 // indirect
139147
github.com/sivchari/nosnakecase v1.7.0 // indirect
140-
github.com/sivchari/tenv v1.7.0 // indirect
141-
github.com/sonatard/noctx v0.0.1 // indirect
142-
github.com/sourcegraph/go-diff v0.6.1 // indirect
148+
github.com/sivchari/tenv v1.7.1 // indirect
149+
github.com/sonatard/noctx v0.0.2 // indirect
150+
github.com/sourcegraph/go-diff v0.7.0 // indirect
143151
github.com/spf13/afero v1.8.2 // indirect
144152
github.com/spf13/cast v1.5.0 // indirect
145-
github.com/spf13/cobra v1.6.0 // indirect
153+
github.com/spf13/cobra v1.7.0 // indirect
146154
github.com/spf13/jwalterweatherman v1.1.0 // indirect
147155
github.com/spf13/pflag v1.0.5 // indirect
148156
github.com/spf13/viper v1.12.0 // indirect
149157
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
150158
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
151-
github.com/stretchr/objx v0.4.0 // indirect
152-
github.com/stretchr/testify v1.8.0 // indirect
159+
github.com/stretchr/objx v0.5.0 // indirect
160+
github.com/stretchr/testify v1.8.4 // indirect
153161
github.com/subosito/gotenv v1.4.1 // indirect
154-
github.com/tdakkota/asciicheck v0.1.1 // indirect
155-
github.com/tetafro/godot v1.4.11 // indirect
156-
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
157-
github.com/timonwong/loggercheck v0.9.3 // indirect
158-
github.com/tomarrell/wrapcheck/v2 v2.7.0 // indirect
162+
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
163+
github.com/tdakkota/asciicheck v0.2.0 // indirect
164+
github.com/tetafro/godot v1.4.15 // indirect
165+
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
166+
github.com/timonwong/loggercheck v0.9.4 // indirect
167+
github.com/tomarrell/wrapcheck/v2 v2.8.1 // indirect
159168
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
160-
github.com/ultraware/funlen v0.0.3 // indirect
169+
github.com/ultraware/funlen v0.1.0 // indirect
161170
github.com/ultraware/whitespace v0.0.5 // indirect
162-
github.com/uudashr/gocognit v1.0.6 // indirect
171+
github.com/uudashr/gocognit v1.1.2 // indirect
172+
github.com/xen0n/gosmopolitan v1.2.2 // indirect
163173
github.com/yagipy/maintidx v1.0.0 // indirect
164174
github.com/yeya24/promlinter v0.2.0 // indirect
165-
gitlab.com/bosi/decorder v0.2.3 // indirect
175+
github.com/ykadowak/zerologlint v0.1.3 // indirect
176+
gitlab.com/bosi/decorder v0.4.1 // indirect
177+
go-simpler.org/sloglint v0.1.2 // indirect
178+
go.tmz.dev/musttag v0.7.2 // indirect
166179
go.uber.org/atomic v1.7.0 // indirect
167180
go.uber.org/multierr v1.6.0 // indirect
168-
go.uber.org/zap v1.17.0 // indirect
169-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
170-
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
171-
golang.org/x/mod v0.6.0 // indirect
172-
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
173-
golang.org/x/sys v0.1.0 // indirect
174-
golang.org/x/text v0.3.8 // indirect
175-
golang.org/x/tools v0.2.0 // indirect
181+
go.uber.org/zap v1.24.0 // indirect
182+
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
183+
golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect
184+
golang.org/x/mod v0.13.0 // indirect
185+
golang.org/x/sync v0.4.0 // indirect
186+
golang.org/x/sys v0.13.0 // indirect
187+
golang.org/x/text v0.13.0 // indirect
188+
golang.org/x/tools v0.14.0 // indirect
176189
google.golang.org/protobuf v1.28.0 // indirect
177190
gopkg.in/ini.v1 v1.67.0 // indirect
178191
gopkg.in/yaml.v2 v2.4.0 // indirect
179192
gopkg.in/yaml.v3 v3.0.1 // indirect
180-
honnef.co/go/tools v0.3.3 // indirect
181-
mvdan.cc/gofumpt v0.4.0 // indirect
193+
honnef.co/go/tools v0.4.6 // indirect
194+
mvdan.cc/gofumpt v0.5.0 // indirect
182195
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
183196
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
184-
mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect
197+
mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect
185198
)

0 commit comments

Comments
 (0)