Skip to content

Commit cc46e96

Browse files
guggeroguggero
committed
multi: fix linter issues
1 parent 5021123 commit cc46e96

File tree

8 files changed

+324
-831
lines changed

8 files changed

+324
-831
lines changed

‎.golangci.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ linters:
6767
- golint
6868
- maligned
6969
- scopelint
70+
- varcheck
71+
- nosnakecase
72+
- structcheck
73+
- deadcode
7074

7175
# New linters that need a code adjustment first.
7276
- wrapcheck
@@ -99,4 +103,5 @@ linters:
99103
- thelper
100104
- exhaustruct
101105
- importas
106+
- interfacebloat
102107

‎basic_client_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
// Tests that NewBasicConn works correctly when macaroon and TLS certificate
13-
// data are passed in directly instead of being supplied as file paths.
13+
// data are passed in directly instead of being supplied as file paths.
1414
func TestParseTLSAndMacaroon(t *testing.T) {
1515
tlsData := `-----BEGIN CERTIFICATE-----
1616
MIIDhzCCAm+gAwIBAgIUEkmdMOVPL92AwgsSYFFBvz4ilmUwDQYJKoZIhvcNAQEL

‎lightning_client.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ type Transaction struct {
753753

754754
// Fee is the amount of fees our wallet committed to this transaction.
755755
// Note that this field is not exhaustive, as it does not account for
756-
// fees taken from inputs that that wallet doesn't know it owns (for
756+
// fees taken from inputs that the wallet doesn't know it owns (for
757757
// example, the fees taken from our channel balance when we close a
758758
// channel).
759759
Fee btcutil.Amount
@@ -1164,7 +1164,7 @@ type QueryRoutesRequest struct {
11641164
// along the route.
11651165
RouteHints [][]zpay32.HopHint
11661166

1167-
// MaxCltv when set is used the the CLTV limit.
1167+
// MaxCltv when set is used the CLTV limit.
11681168
MaxCltv *uint32
11691169

11701170
// UseMissionControl if set to true, edge probabilities from mission
@@ -1652,8 +1652,8 @@ type PendingHtlc struct {
16521652
HtlcIndex uint64
16531653

16541654
// ForwardingChannel is the channel that the htlc was forwarded from if
1655-
// if is an incoming hltc, or should to forwarded to if it is an
1656-
// outgoing htlc. This value may be zero for htlcs that we have not made
1655+
// is an incoming hltc, or should to forwarded to if it is an outgoing
1656+
// htlc. This value may be zero for htlcs that we have not made
16571657
// forwarding decisions for yet.
16581658
ForwardingChannel lnwire.ShortChannelID
16591659

‎lnd_services.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ type GrpcLndServices struct {
184184
cleanup func()
185185
}
186186

187-
// NewLndServices creates creates a connection to the given lnd instance and
188-
// creates a set of required RPC services.
187+
// NewLndServices creates a connection to the given lnd instance and creates a
188+
// set of required RPC services.
189189
func NewLndServices(cfg *LndServicesConfig) (*GrpcLndServices, error) {
190190
// We need to use a custom dialer so we can also connect to unix
191191
// sockets and not just TCP addresses.

‎signer_client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ func (s *signerClient) VerifyMessage(ctx context.Context, msg, sig []byte,
383383
// derivation between the ephemeral public key and the key specified by the key
384384
// locator (or the node's identity private key if no key locator is specified):
385385
//
386-
// P_shared = privKeyNode * ephemeralPubkey
386+
// P_shared = privKeyNode * ephemeralPubkey
387387
//
388388
// The resulting shared public key is serialized in the compressed format and
389389
// hashed with SHA256, resulting in a final key length of 256 bits.

‎tools/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
FROM golang:1.18.5-buster
1+
FROM golang:1.19.4-buster
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+
&& go install -trimpath github.com/golangci/golangci-lint/cmd/golangci-lint \
1415
&& chmod -R 777 /tmp/build/
1516

1617
WORKDIR /build

‎tools/go.mod‎

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

3+
go 1.19
4+
35
require (
4-
github.com/golangci/golangci-lint v1.46.2
6+
github.com/golangci/golangci-lint v1.51.2
57
github.com/rinchsan/gosimports v0.1.5
68
)
79

810
require (
9-
4d63.com/gochecknoglobals v0.1.0 // indirect
10-
github.com/Antonboom/errname v0.1.6 // indirect
11+
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
12+
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
1115
github.com/Antonboom/nilnil v0.1.1 // indirect
12-
github.com/BurntSushi/toml v1.1.0 // indirect
16+
github.com/BurntSushi/toml v1.2.1 // indirect
1317
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
14-
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.1.0 // indirect
18+
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
1519
github.com/Masterminds/semver v1.5.0 // indirect
16-
github.com/OpenPeeDeeP/depguard v1.1.0 // indirect
20+
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
1721
github.com/alexkohler/prealloc v1.0.0 // indirect
18-
github.com/ashanbrown/forbidigo v1.3.0 // indirect
22+
github.com/alingse/asasalint v0.0.11 // indirect
23+
github.com/ashanbrown/forbidigo v1.4.0 // indirect
1924
github.com/ashanbrown/makezero v1.1.1 // indirect
2025
github.com/beorn7/perks v1.0.1 // indirect
2126
github.com/bkielbasa/cyclop v1.2.0 // indirect
2227
github.com/blizzy78/varnamelen v0.8.0 // indirect
23-
github.com/bombsimon/wsl/v3 v3.3.0 // indirect
28+
github.com/bombsimon/wsl/v3 v3.4.0 // indirect
2429
github.com/breml/bidichk v0.2.3 // indirect
2530
github.com/breml/errchkjson v0.3.0 // indirect
2631
github.com/butuzov/ireturn v0.1.1 // indirect
2732
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2833
github.com/charithe/durationcheck v0.0.9 // indirect
29-
github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4 // indirect
30-
github.com/daixiang0/gci v0.3.3 // indirect
34+
github.com/chavacava/garif v0.0.0-20221024190013-b3ef35877348 // indirect
35+
github.com/curioswitch/go-reassign v0.2.0 // indirect
36+
github.com/daixiang0/gci v0.9.1 // indirect
3137
github.com/davecgh/go-spew v1.1.1 // indirect
3238
github.com/denis-tingaikin/go-header v0.4.3 // indirect
3339
github.com/esimonov/ifshort v1.0.4 // indirect
3440
github.com/ettle/strcase v0.1.1 // indirect
35-
github.com/fatih/color v1.13.0 // indirect
41+
github.com/fatih/color v1.14.1 // indirect
3642
github.com/fatih/structtag v1.2.0 // indirect
37-
github.com/firefart/nonamedreturns v1.0.1 // indirect
43+
github.com/firefart/nonamedreturns v1.0.4 // indirect
3844
github.com/fsnotify/fsnotify v1.5.4 // indirect
39-
github.com/fzipp/gocyclo v0.5.1 // indirect
40-
github.com/go-critic/go-critic v0.6.3 // indirect
41-
github.com/go-toolsmith/astcast v1.0.0 // indirect
42-
github.com/go-toolsmith/astcopy v1.0.0 // indirect
43-
github.com/go-toolsmith/astequal v1.0.1 // indirect
44-
github.com/go-toolsmith/astfmt v1.0.0 // indirect
45-
github.com/go-toolsmith/astp v1.0.0 // indirect
46-
github.com/go-toolsmith/strparse v1.0.0 // indirect
47-
github.com/go-toolsmith/typep v1.0.2 // indirect
48-
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
45+
github.com/fzipp/gocyclo v0.6.0 // indirect
46+
github.com/go-critic/go-critic v0.6.7 // indirect
47+
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
50+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
51+
github.com/go-toolsmith/astp v1.1.0 // indirect
52+
github.com/go-toolsmith/strparse v1.1.0 // indirect
53+
github.com/go-toolsmith/typep v1.1.0 // indirect
54+
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
4955
github.com/gobwas/glob v0.2.3 // indirect
5056
github.com/gofrs/flock v0.8.1 // indirect
5157
github.com/golang/protobuf v1.5.2 // indirect
5258
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
5359
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
5460
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
55-
github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect
61+
github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect
5662
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
5763
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
58-
github.com/golangci/misspell v0.3.5 // indirect
59-
github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2 // indirect
64+
github.com/golangci/misspell v0.4.0 // indirect
65+
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
6066
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
61-
github.com/google/go-cmp v0.5.7 // indirect
62-
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
67+
github.com/google/go-cmp v0.5.9 // indirect
68+
github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 // indirect
6369
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
6470
github.com/gostaticanalysis/comment v1.4.2 // indirect
6571
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
6672
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
6773
github.com/hashicorp/errwrap v1.0.0 // indirect
6874
github.com/hashicorp/go-multierror v1.1.1 // indirect
69-
github.com/hashicorp/go-version v1.4.0 // indirect
75+
github.com/hashicorp/go-version v1.6.0 // indirect
7076
github.com/hashicorp/hcl v1.0.0 // indirect
7177
github.com/hexops/gotextdiff v1.0.3 // indirect
72-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
78+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
7379
github.com/jgautheron/goconst v1.5.1 // indirect
7480
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
7581
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
7682
github.com/julz/importas v0.1.0 // indirect
77-
github.com/kisielk/errcheck v1.6.0 // indirect
83+
github.com/junk1tm/musttag v0.4.5 // indirect
84+
github.com/kisielk/errcheck v1.6.3 // indirect
7885
github.com/kisielk/gotool v1.0.0 // indirect
79-
github.com/kulti/thelper v0.6.2 // indirect
80-
github.com/kunwardeep/paralleltest v1.0.3 // indirect
81-
github.com/kyoh86/exportloopref v0.1.8 // indirect
86+
github.com/kkHAIKE/contextcheck v1.1.3 // indirect
87+
github.com/kulti/thelper v0.6.3 // indirect
88+
github.com/kunwardeep/paralleltest v1.0.6 // indirect
89+
github.com/kyoh86/exportloopref v0.1.11 // indirect
8290
github.com/ldez/gomoddirectives v0.2.3 // indirect
83-
github.com/ldez/tagliatelle v0.3.1 // indirect
84-
github.com/leonklingele/grouper v1.1.0 // indirect
91+
github.com/ldez/tagliatelle v0.4.0 // indirect
92+
github.com/leonklingele/grouper v1.1.1 // indirect
8593
github.com/lufeee/execinquery v1.2.1 // indirect
8694
github.com/magiconair/properties v1.8.6 // indirect
87-
github.com/maratori/testpackage v1.0.1 // indirect
95+
github.com/maratori/testableexamples v1.0.0 // indirect
96+
github.com/maratori/testpackage v1.1.0 // indirect
8897
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
89-
github.com/mattn/go-colorable v0.1.12 // indirect
90-
github.com/mattn/go-isatty v0.0.14 // indirect
98+
github.com/mattn/go-colorable v0.1.13 // indirect
99+
github.com/mattn/go-isatty v0.0.17 // indirect
91100
github.com/mattn/go-runewidth v0.0.9 // indirect
92101
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
93102
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
94-
github.com/mgechev/revive v1.2.1 // indirect
103+
github.com/mgechev/revive v1.2.5 // indirect
95104
github.com/mitchellh/go-homedir v1.1.0 // indirect
96105
github.com/mitchellh/mapstructure v1.5.0 // indirect
97106
github.com/moricho/tparallel v0.2.1 // indirect
98107
github.com/nakabonne/nestif v0.3.1 // indirect
99108
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
100-
github.com/nishanths/exhaustive v0.7.11 // indirect
109+
github.com/nishanths/exhaustive v0.9.5 // indirect
101110
github.com/nishanths/predeclared v0.2.2 // indirect
111+
github.com/nunnatsa/ginkgolinter v0.8.1 // indirect
102112
github.com/olekukonko/tablewriter v0.0.5 // indirect
103113
github.com/pelletier/go-toml v1.9.5 // indirect
104-
github.com/pelletier/go-toml/v2 v2.0.0 // indirect
105-
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
114+
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
106115
github.com/pkg/errors v0.9.1 // indirect
107116
github.com/pmezard/go-difflib v1.0.0 // indirect
108-
github.com/polyfloyd/go-errorlint v1.0.0 // indirect
117+
github.com/polyfloyd/go-errorlint v1.1.0 // indirect
109118
github.com/prometheus/client_golang v1.12.1 // indirect
110119
github.com/prometheus/client_model v0.2.0 // indirect
111120
github.com/prometheus/common v0.32.1 // indirect
112121
github.com/prometheus/procfs v0.7.3 // indirect
113-
github.com/quasilyte/go-ruleguard v0.3.16-0.20220213074421-6aa060fab41a // indirect
114-
github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5 // indirect
122+
github.com/quasilyte/go-ruleguard v0.3.19 // indirect
123+
github.com/quasilyte/gogrep v0.5.0 // indirect
115124
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
116125
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
117-
github.com/ryancurrah/gomodguard v1.2.3 // indirect
118-
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
119-
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
120-
github.com/securego/gosec/v2 v2.11.0 // indirect
126+
github.com/ryancurrah/gomodguard v1.3.0 // indirect
127+
github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect
128+
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
129+
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
121132
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
122-
github.com/sirupsen/logrus v1.8.1 // indirect
133+
github.com/sirupsen/logrus v1.9.0 // indirect
123134
github.com/sivchari/containedctx v1.0.2 // indirect
124-
github.com/sivchari/tenv v1.5.0 // indirect
135+
github.com/sivchari/nosnakecase v1.7.0 // indirect
136+
github.com/sivchari/tenv v1.7.1 // indirect
125137
github.com/sonatard/noctx v0.0.1 // indirect
126-
github.com/sourcegraph/go-diff v0.6.1 // indirect
138+
github.com/sourcegraph/go-diff v0.7.0 // indirect
127139
github.com/spf13/afero v1.8.2 // indirect
128-
github.com/spf13/cast v1.4.1 // indirect
129-
github.com/spf13/cobra v1.4.0 // indirect
140+
github.com/spf13/cast v1.5.0 // indirect
141+
github.com/spf13/cobra v1.6.1 // indirect
130142
github.com/spf13/jwalterweatherman v1.1.0 // indirect
131143
github.com/spf13/pflag v1.0.5 // indirect
132-
github.com/spf13/viper v1.11.0 // indirect
144+
github.com/spf13/viper v1.12.0 // indirect
133145
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
134146
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
135-
github.com/stretchr/objx v0.1.1 // indirect
136-
github.com/stretchr/testify v1.7.1 // indirect
137-
github.com/subosito/gotenv v1.2.0 // indirect
138-
github.com/sylvia7788/contextcheck v1.0.4 // indirect
147+
github.com/stretchr/objx v0.5.0 // indirect
148+
github.com/stretchr/testify v1.8.1 // indirect
149+
github.com/subosito/gotenv v1.4.1 // indirect
150+
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
139151
github.com/tdakkota/asciicheck v0.1.1 // indirect
140152
github.com/tetafro/godot v1.4.11 // indirect
141-
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
142-
github.com/tomarrell/wrapcheck/v2 v2.6.1 // indirect
143-
github.com/tommy-muehle/go-mnd/v2 v2.5.0 // 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
156+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
144157
github.com/ultraware/funlen v0.0.3 // indirect
145158
github.com/ultraware/whitespace v0.0.5 // indirect
146-
github.com/uudashr/gocognit v1.0.5 // indirect
159+
github.com/uudashr/gocognit v1.0.6 // indirect
147160
github.com/yagipy/maintidx v1.0.0 // indirect
148161
github.com/yeya24/promlinter v0.2.0 // indirect
149-
gitlab.com/bosi/decorder v0.2.1 // indirect
150-
golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
151-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
152-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
153-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
154-
golang.org/x/text v0.3.8 // indirect
155-
golang.org/x/tools v0.1.12 // indirect
162+
gitlab.com/bosi/decorder v0.2.3 // indirect
163+
go.uber.org/atomic v1.7.0 // indirect
164+
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
156173
google.golang.org/protobuf v1.28.0 // indirect
157-
gopkg.in/ini.v1 v1.66.4 // indirect
174+
gopkg.in/ini.v1 v1.67.0 // indirect
158175
gopkg.in/yaml.v2 v2.4.0 // indirect
159-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
160-
honnef.co/go/tools v0.3.1 // indirect
161-
mvdan.cc/gofumpt v0.3.1 // indirect
176+
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
162179
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
163180
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
164-
mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5 // indirect
181+
mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect
165182
)
166-
167-
go 1.17

0 commit comments

Comments
 (0)