Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(lint): fix issues found by golangcilint 1.47.3 #2715

Merged
merged 1 commit into from
Aug 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ issues:
- lll
source: "^//go:generate "

- linters:
- lll
path: lib/runtime/wasmer/imports\.go
source: "^// extern "

- linters:
- lll
path: lib/runtime/wasmer/imports\.go
source: '{"ext_.+", ext_.+, C.ext_.+},$'

- source: "// https://"
linters:
- lll
Expand Down
9 changes: 9 additions & 0 deletions dot/import_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,10 @@ func TestImportState(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

err := ImportState(tt.args.basepath, tt.args.stateFP, tt.args.headerFP, tt.args.firstSlot)
if tt.err != nil {
assert.EqualError(t, err, tt.err.Error())
Expand Down Expand Up @@ -175,7 +178,10 @@ func Test_newHeaderFromFile(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

got, err := newHeaderFromFile(tt.filename)
if tt.err != nil {
assert.EqualError(t, err, tt.err.Error())
Expand Down Expand Up @@ -208,7 +214,10 @@ func Test_newTrieFromPairs(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

got, err := newTrieFromPairs(tt.filename)
if tt.err != nil {
assert.EqualError(t, err, tt.err.Error())
Expand Down
3 changes: 3 additions & 0 deletions dot/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ func TestLoadGlobalNodeName(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

gotNodename, err := LoadGlobalNodeName(tt.basepath)
if tt.err != nil {
assert.EqualError(t, err, tt.err.Error())
Expand Down
26 changes: 24 additions & 2 deletions dot/services_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,10 @@ func Test_newInMemoryDB(t *testing.T) {
//go:generate mockgen -destination=mock_service_builder_test.go -package $GOPACKAGE . ServiceBuilder

func Test_nodeBuilder_createBABEService(t *testing.T) {
t.Parallel()

ctrl := gomock.NewController(t)
mockBabeIFace := NewMockServiceIFace(ctrl)
t.Parallel()

cfg := NewTestConfig(t)

Expand Down Expand Up @@ -204,7 +205,10 @@ func Test_nodeBuilder_createBABEService(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

stateSrvc := newStateService(t, ctrl)
mockBabeBuilder := NewMockServiceBuilder(ctrl)
mockBabeBuilder.EXPECT().NewServiceIFace(
Expand Down Expand Up @@ -314,7 +318,10 @@ func Test_nodeBuilder_createCoreService(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

cfg := NewTestConfig(t)
ctrl := gomock.NewController(t)
stateSrvc := newStateService(t, ctrl)
Expand Down Expand Up @@ -351,9 +358,12 @@ func Test_nodeBuilder_createNetworkService(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
cfg := NewTestConfig(t)
t.Parallel()
ctrl := gomock.NewController(t)

cfg := NewTestConfig(t)
stateSrvc := newStateService(t, ctrl)
no := nodeBuilder{}
got, err := no.createNetworkService(cfg, stateSrvc, nil)
Expand Down Expand Up @@ -384,7 +394,10 @@ func Test_nodeBuilder_createRPCService(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

cfg := NewTestConfig(t)
ctrl := gomock.NewController(t)
stateSrvc := newStateService(t, ctrl)
Expand Down Expand Up @@ -435,7 +448,10 @@ func Test_nodeBuilder_createGRANDPAService(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

cfg := NewTestConfig(t)
ctrl := gomock.NewController(t)
stateSrvc := newStateService(t, ctrl)
Expand Down Expand Up @@ -486,7 +502,10 @@ func Test_createRuntime(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

ctrl := gomock.NewController(t)
stateSrvc := newStateService(t, ctrl)
code, err := stateSrvc.Storage.LoadCode(nil)
Expand Down Expand Up @@ -534,7 +553,10 @@ func Test_nodeBuilder_newSyncService(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

cfg := NewTestConfig(t)
ctrl := gomock.NewController(t)
stateSrvc := newStateService(t, ctrl)
Expand Down
11 changes: 9 additions & 2 deletions dot/state/grandpa_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func testBlockState(t *testing.T, db chaindb.Database) *BlockState {
return bs
}

func TestAddScheduledChangesKeepTheRightForkTree(t *testing.T) {
func TestAddScheduledChangesKeepTheRightForkTree(t *testing.T) { //nolint:tparallel
t.Parallel()

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

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

func TestApplyForcedChanges(t *testing.T) {
t.Parallel()

keyring, err := keystore.NewSr25519Keyring()
require.NoError(t, err)

Expand Down Expand Up @@ -768,6 +769,8 @@ func TestApplyForcedChanges(t *testing.T) {
}

func TestApplyScheduledChangesKeepDescendantForcedChanges(t *testing.T) {
t.Parallel()

keyring, err := keystore.NewSr25519Keyring()
require.NoError(t, err)

Expand Down Expand Up @@ -885,6 +888,8 @@ func TestApplyScheduledChangesKeepDescendantForcedChanges(t *testing.T) {
}

func TestApplyScheduledChangeGetApplicableChange(t *testing.T) {
t.Parallel()

keyring, err := keystore.NewSr25519Keyring()
require.NoError(t, err)

Expand Down Expand Up @@ -1120,6 +1125,8 @@ func TestApplyScheduledChangeGetApplicableChange(t *testing.T) {
}

func TestApplyScheduledChange(t *testing.T) {
t.Parallel()

keyring, err := keystore.NewSr25519Keyring()
require.NoError(t, err)

Expand Down
2 changes: 2 additions & 0 deletions dot/sync/chain_processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,9 @@ func Test_chainProcessor_handleBody(t *testing.T) {
testBody := types.NewBody(testExtrinsics)

t.Run("base case", func(t *testing.T) {
t.Parallel()
ctrl := gomock.NewController(t)

mockTransactionState := NewMockTransactionState(ctrl)
mockTransactionState.EXPECT().RemoveExtrinsic(testExtrinsics[0])
mockTransactionState.EXPECT().RemoveExtrinsic(testExtrinsics[1])
Expand Down
2 changes: 1 addition & 1 deletion dot/sync/chain_sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ func (cs *chainSync) handleResult(resultWorker *worker) error {
// handle results from worker
// if there is an error, potentially retry the worker
if resultWorker.err == nil || resultWorker.ctx.Err() != nil {
return nil
return nil //nolint:nilerr
}

logger.Debugf("worker id %d failed: %s", resultWorker.id, resultWorker.err.err)
Expand Down
44 changes: 27 additions & 17 deletions internal/pprof/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package pprof

import (
"context"
"io/ioutil"
"io"
"net/http"
"testing"
"time"
Expand Down Expand Up @@ -63,9 +63,10 @@ func Test_Server(t *testing.T) {
}

type httpResult struct {
url string
response *http.Response
err error
url string
status int
body []byte
err error
}
results := make(chan httpResult)

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

go func(client *http.Client, request *http.Request, results chan<- httpResult) {
response, err := client.Do(request)
results <- httpResult{
url: request.URL.String(),
response: response,
err: err,
result := httpResult{
url: request.URL.String(),
}
var response *http.Response
response, result.err = client.Do(request)
if result.err != nil {
results <- result
return
}

result.status = response.StatusCode
result.body, result.err = io.ReadAll(response.Body)
if result.err != nil {
_ = response.Body.Close()
results <- result
return
}

result.err = response.Body.Close()
results <- result
}(httpClient, request, results)
}

for range pathsToCheck {
httpResult := <-results

require.NoErrorf(t, httpResult.err, "unexpected error for URL %s: %s", httpResult.url, httpResult.err)
assert.Equalf(t, http.StatusOK, httpResult.response.StatusCode,
"unexpected status code for URL %s: %s", httpResult.url, http.StatusText(httpResult.response.StatusCode))

b, err := ioutil.ReadAll(httpResult.response.Body)
require.NoErrorf(t, err, "unexpected error for URL %s: %s", httpResult.url, err)
assert.NotEmptyf(t, b, "response body is empty for URL %s", httpResult.url)
assert.Equalf(t, http.StatusOK, httpResult.status,
"unexpected status code for URL %s: %s", httpResult.url, http.StatusText(httpResult.status))

err = httpResult.response.Body.Close()
assert.NoErrorf(t, err, "unexpected error for URL %s: %s", httpResult.url, err)
assert.NotEmptyf(t, httpResult.body, "response body is empty for URL %s", httpResult.url)
}

cancel()
Expand Down
4 changes: 4 additions & 0 deletions internal/trie/node/header_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import (
)

func Test_encodeHeader(t *testing.T) {
t.Parallel()

testCases := map[string]struct {
node *Node
writes []writeCall
Expand Down Expand Up @@ -275,6 +277,8 @@ func Test_encodeHeader_At_Maximum(t *testing.T) {
}

func Test_decodeHeader(t *testing.T) {
t.Parallel()

testCases := map[string]struct {
reads []readCall
variant byte
Expand Down
2 changes: 2 additions & 0 deletions lib/grandpa/message_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,8 @@ func signFakeFullVote(
}

func TestService_VerifyBlockJustification(t *testing.T) {
t.Parallel()

precommits := buildTestJustification(t, 2, 1, 0, kr, precommit)
justification := newJustification(1, testHash, 1, precommits)
justificationBytes, err := scale.Marshal(*justification)
Expand Down
Loading