Skip to content

Commit 5765e67

Browse files
qdm12qdm12
authored
fix(lint): fix issues found by golangcilint 1.47.3 (#2715)
- Fix issues caused by fixed `tparallel` - Fix issues caused by fixed `lll` - Add exclude rules for `lll` for C imports
1 parent b68e8a0 commit 5765e67

21 files changed

+143
-52
lines changed

‎.golangci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,16 @@ issues:
103103
- lll
104104
source: "^//go:generate "
105105

106+
- linters:
107+
- lll
108+
path: lib/runtime/wasmer/imports\.go
109+
source: "^// extern "
110+
111+
- linters:
112+
- lll
113+
path: lib/runtime/wasmer/imports\.go
114+
source: '{"ext_.+", ext_.+, C.ext_.+},$'
115+
106116
- source: "// https://"
107117
linters:
108118
- lll

‎dot/import_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,10 @@ func TestImportState(t *testing.T) {
107107
},
108108
}
109109
for _, tt := range tests {
110+
tt := tt
110111
t.Run(tt.name, func(t *testing.T) {
112+
t.Parallel()
113+
111114
err := ImportState(tt.args.basepath, tt.args.stateFP, tt.args.headerFP, tt.args.firstSlot)
112115
if tt.err != nil {
113116
assert.EqualError(t, err, tt.err.Error())
@@ -175,7 +178,10 @@ func Test_newHeaderFromFile(t *testing.T) {
175178
},
176179
}
177180
for _, tt := range tests {
181+
tt := tt
178182
t.Run(tt.name, func(t *testing.T) {
183+
t.Parallel()
184+
179185
got, err := newHeaderFromFile(tt.filename)
180186
if tt.err != nil {
181187
assert.EqualError(t, err, tt.err.Error())
@@ -208,7 +214,10 @@ func Test_newTrieFromPairs(t *testing.T) {
208214
},
209215
}
210216
for _, tt := range tests {
217+
tt := tt
211218
t.Run(tt.name, func(t *testing.T) {
219+
t.Parallel()
220+
212221
got, err := newTrieFromPairs(tt.filename)
213222
if tt.err != nil {
214223
assert.EqualError(t, err, tt.err.Error())

‎dot/node_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@ func TestLoadGlobalNodeName(t *testing.T) {
9191
},
9292
}
9393
for _, tt := range tests {
94+
tt := tt
9495
t.Run(tt.name, func(t *testing.T) {
96+
t.Parallel()
97+
9598
gotNodename, err := LoadGlobalNodeName(tt.basepath)
9699
if tt.err != nil {
97100
assert.EqualError(t, err, tt.err.Error())

‎dot/services_test.go

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,10 @@ func Test_newInMemoryDB(t *testing.T) {
137137
//go:generate mockgen -destination=mock_service_builder_test.go -package $GOPACKAGE . ServiceBuilder
138138

139139
func Test_nodeBuilder_createBABEService(t *testing.T) {
140+
t.Parallel()
141+
140142
ctrl := gomock.NewController(t)
141143
mockBabeIFace := NewMockServiceIFace(ctrl)
142-
t.Parallel()
143144

144145
cfg := NewTestConfig(t)
145146

@@ -204,7 +205,10 @@ func Test_nodeBuilder_createBABEService(t *testing.T) {
204205
},
205206
}
206207
for _, tt := range tests {
208+
tt := tt
207209
t.Run(tt.name, func(t *testing.T) {
210+
t.Parallel()
211+
208212
stateSrvc := newStateService(t, ctrl)
209213
mockBabeBuilder := NewMockServiceBuilder(ctrl)
210214
mockBabeBuilder.EXPECT().NewServiceIFace(
@@ -314,7 +318,10 @@ func Test_nodeBuilder_createCoreService(t *testing.T) {
314318
},
315319
}
316320
for _, tt := range tests {
321+
tt := tt
317322
t.Run(tt.name, func(t *testing.T) {
323+
t.Parallel()
324+
318325
cfg := NewTestConfig(t)
319326
ctrl := gomock.NewController(t)
320327
stateSrvc := newStateService(t, ctrl)
@@ -351,9 +358,12 @@ func Test_nodeBuilder_createNetworkService(t *testing.T) {
351358
},
352359
}
353360
for _, tt := range tests {
361+
tt := tt
354362
t.Run(tt.name, func(t *testing.T) {
355-
cfg := NewTestConfig(t)
363+
t.Parallel()
356364
ctrl := gomock.NewController(t)
365+
366+
cfg := NewTestConfig(t)
357367
stateSrvc := newStateService(t, ctrl)
358368
no := nodeBuilder{}
359369
got, err := no.createNetworkService(cfg, stateSrvc, nil)
@@ -384,7 +394,10 @@ func Test_nodeBuilder_createRPCService(t *testing.T) {
384394
},
385395
}
386396
for _, tt := range tests {
397+
tt := tt
387398
t.Run(tt.name, func(t *testing.T) {
399+
t.Parallel()
400+
388401
cfg := NewTestConfig(t)
389402
ctrl := gomock.NewController(t)
390403
stateSrvc := newStateService(t, ctrl)
@@ -435,7 +448,10 @@ func Test_nodeBuilder_createGRANDPAService(t *testing.T) {
435448
},
436449
}
437450
for _, tt := range tests {
451+
tt := tt
438452
t.Run(tt.name, func(t *testing.T) {
453+
t.Parallel()
454+
439455
cfg := NewTestConfig(t)
440456
ctrl := gomock.NewController(t)
441457
stateSrvc := newStateService(t, ctrl)
@@ -486,7 +502,10 @@ func Test_createRuntime(t *testing.T) {
486502
},
487503
}
488504
for _, tt := range tests {
505+
tt := tt
489506
t.Run(tt.name, func(t *testing.T) {
507+
t.Parallel()
508+
490509
ctrl := gomock.NewController(t)
491510
stateSrvc := newStateService(t, ctrl)
492511
code, err := stateSrvc.Storage.LoadCode(nil)
@@ -534,7 +553,10 @@ func Test_nodeBuilder_newSyncService(t *testing.T) {
534553
},
535554
}
536555
for _, tt := range tests {
556+
tt := tt
537557
t.Run(tt.name, func(t *testing.T) {
558+
t.Parallel()
559+
538560
cfg := NewTestConfig(t)
539561
ctrl := gomock.NewController(t)
540562
stateSrvc := newStateService(t, ctrl)

‎dot/state/grandpa_test.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func testBlockState(t *testing.T, db chaindb.Database) *BlockState {
142142
return bs
143143
}
144144

145-
func TestAddScheduledChangesKeepTheRightForkTree(t *testing.T) {
145+
func TestAddScheduledChangesKeepTheRightForkTree(t *testing.T) { //nolint:tparallel
146146
t.Parallel()
147147

148148
keyring, err := keystore.NewSr25519Keyring()
@@ -217,7 +217,6 @@ func TestAddScheduledChangesKeepTheRightForkTree(t *testing.T) {
217217
}
218218

219219
for tname, tt := range tests {
220-
tt := tt
221220
t.Run(tname, func(t *testing.T) {
222221
// clear the scheduledChangeRoots after the test ends
223222
// this does not cause race condition because t.Run without
@@ -566,6 +565,8 @@ func TestNextGrandpaAuthorityChange(t *testing.T) {
566565
}
567566

568567
func TestApplyForcedChanges(t *testing.T) {
568+
t.Parallel()
569+
569570
keyring, err := keystore.NewSr25519Keyring()
570571
require.NoError(t, err)
571572

@@ -768,6 +769,8 @@ func TestApplyForcedChanges(t *testing.T) {
768769
}
769770

770771
func TestApplyScheduledChangesKeepDescendantForcedChanges(t *testing.T) {
772+
t.Parallel()
773+
771774
keyring, err := keystore.NewSr25519Keyring()
772775
require.NoError(t, err)
773776

@@ -885,6 +888,8 @@ func TestApplyScheduledChangesKeepDescendantForcedChanges(t *testing.T) {
885888
}
886889

887890
func TestApplyScheduledChangeGetApplicableChange(t *testing.T) {
891+
t.Parallel()
892+
888893
keyring, err := keystore.NewSr25519Keyring()
889894
require.NoError(t, err)
890895

@@ -1120,6 +1125,8 @@ func TestApplyScheduledChangeGetApplicableChange(t *testing.T) {
11201125
}
11211126

11221127
func TestApplyScheduledChange(t *testing.T) {
1128+
t.Parallel()
1129+
11231130
keyring, err := keystore.NewSr25519Keyring()
11241131
require.NoError(t, err)
11251132

‎dot/sync/chain_processor_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,9 @@ func Test_chainProcessor_handleBody(t *testing.T) {
217217
testBody := types.NewBody(testExtrinsics)
218218

219219
t.Run("base case", func(t *testing.T) {
220+
t.Parallel()
220221
ctrl := gomock.NewController(t)
222+
221223
mockTransactionState := NewMockTransactionState(ctrl)
222224
mockTransactionState.EXPECT().RemoveExtrinsic(testExtrinsics[0])
223225
mockTransactionState.EXPECT().RemoveExtrinsic(testExtrinsics[1])

‎dot/sync/chain_sync.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ func (cs *chainSync) handleResult(resultWorker *worker) error {
477477
// handle results from worker
478478
// if there is an error, potentially retry the worker
479479
if resultWorker.err == nil || resultWorker.ctx.Err() != nil {
480-
return nil
480+
return nil //nolint:nilerr
481481
}
482482

483483
logger.Debugf("worker id %d failed: %s", resultWorker.id, resultWorker.err.err)

‎internal/pprof/server_test.go

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package pprof
55

66
import (
77
"context"
8-
"io/ioutil"
8+
"io"
99
"net/http"
1010
"testing"
1111
"time"
@@ -63,9 +63,10 @@ func Test_Server(t *testing.T) {
6363
}
6464

6565
type httpResult struct {
66-
url string
67-
response *http.Response
68-
err error
66+
url string
67+
status int
68+
body []byte
69+
err error
6970
}
7071
results := make(chan httpResult)
7172

@@ -76,28 +77,37 @@ func Test_Server(t *testing.T) {
7677
require.NoError(t, err)
7778

7879
go func(client *http.Client, request *http.Request, results chan<- httpResult) {
79-
response, err := client.Do(request)
80-
results <- httpResult{
81-
url: request.URL.String(),
82-
response: response,
83-
err: err,
80+
result := httpResult{
81+
url: request.URL.String(),
8482
}
83+
var response *http.Response
84+
response, result.err = client.Do(request)
85+
if result.err != nil {
86+
results <- result
87+
return
88+
}
89+
90+
result.status = response.StatusCode
91+
result.body, result.err = io.ReadAll(response.Body)
92+
if result.err != nil {
93+
_ = response.Body.Close()
94+
results <- result
95+
return
96+
}
97+
98+
result.err = response.Body.Close()
99+
results <- result
85100
}(httpClient, request, results)
86101
}
87102

88103
for range pathsToCheck {
89104
httpResult := <-results
90105

91106
require.NoErrorf(t, httpResult.err, "unexpected error for URL %s: %s", httpResult.url, httpResult.err)
92-
assert.Equalf(t, http.StatusOK, httpResult.response.StatusCode,
93-
"unexpected status code for URL %s: %s", httpResult.url, http.StatusText(httpResult.response.StatusCode))
94-
95-
b, err := ioutil.ReadAll(httpResult.response.Body)
96-
require.NoErrorf(t, err, "unexpected error for URL %s: %s", httpResult.url, err)
97-
assert.NotEmptyf(t, b, "response body is empty for URL %s", httpResult.url)
107+
assert.Equalf(t, http.StatusOK, httpResult.status,
108+
"unexpected status code for URL %s: %s", httpResult.url, http.StatusText(httpResult.status))
98109

99-
err = httpResult.response.Body.Close()
100-
assert.NoErrorf(t, err, "unexpected error for URL %s: %s", httpResult.url, err)
110+
assert.NotEmptyf(t, httpResult.body, "response body is empty for URL %s", httpResult.url)
101111
}
102112

103113
cancel()

‎internal/trie/node/header_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import (
1616
)
1717

1818
func Test_encodeHeader(t *testing.T) {
19+
t.Parallel()
20+
1921
testCases := map[string]struct {
2022
node *Node
2123
writes []writeCall
@@ -275,6 +277,8 @@ func Test_encodeHeader_At_Maximum(t *testing.T) {
275277
}
276278

277279
func Test_decodeHeader(t *testing.T) {
280+
t.Parallel()
281+
278282
testCases := map[string]struct {
279283
reads []readCall
280284
variant byte

‎lib/grandpa/message_handler_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,6 +1252,8 @@ func signFakeFullVote(
12521252
}
12531253

12541254
func TestService_VerifyBlockJustification(t *testing.T) {
1255+
t.Parallel()
1256+
12551257
precommits := buildTestJustification(t, 2, 1, 0, kr, precommit)
12561258
justification := newJustification(1, testHash, 1, precommits)
12571259
justificationBytes, err := scale.Marshal(*justification)

0 commit comments

Comments
 (0)