Skip to content

Commit 0f82c95

Browse files
alpealpe
authored
Linter only (#1609)
* Linter only * Bump linter version
1 parent 3d9d92c commit 0f82c95

14 files changed

+37
-40
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
lint:
6565
docker:
66-
- image: golangci/golangci-lint:v1.52.2
66+
- image: golangci/golangci-lint:v1.54.2
6767
steps:
6868
- checkout
6969
- run:

‎x/wasm/client/cli/gov_tx_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ import (
55
"strings"
66
"testing"
77

8-
"github.com/CosmWasm/wasmd/x/wasm/keeper/testdata"
9-
108
"github.com/stretchr/testify/assert"
119
"github.com/stretchr/testify/require"
1210

11+
"github.com/CosmWasm/wasmd/x/wasm/keeper/testdata"
1312
"github.com/CosmWasm/wasmd/x/wasm/types"
1413
)
1514

‎x/wasm/client/cli/tx_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ import (
44
"encoding/hex"
55
"testing"
66

7-
"github.com/CosmWasm/wasmd/x/wasm/keeper/testdata"
8-
97
"github.com/stretchr/testify/assert"
108
"github.com/stretchr/testify/require"
119

1210
sdk "github.com/cosmos/cosmos-sdk/types"
1311

1412
"github.com/CosmWasm/wasmd/x/wasm/ioutils"
13+
"github.com/CosmWasm/wasmd/x/wasm/keeper/testdata"
1514
"github.com/CosmWasm/wasmd/x/wasm/types"
1615
)
1716

‎x/wasm/keeper/genesis.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func InitGenesis(ctx sdk.Context, keeper *Keeper, data types.GenesisState) ([]ab
4747
if err != nil {
4848
return nil, errorsmod.Wrapf(err, "address in contract number %d", i)
4949
}
50-
err = keeper.importContract(ctx, contractAddr, &contract.ContractInfo, contract.ContractState, contract.ContractCodeHistory)
50+
err = keeper.importContract(ctx, contractAddr, &contract.ContractInfo, contract.ContractState, contract.ContractCodeHistory) //nolint:gosec
5151
if err != nil {
5252
return nil, errorsmod.Wrapf(err, "contract number %d", i)
5353
}

‎x/wasm/keeper/handler_plugin_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ func TestIBCRawPacketHandler(t *testing.T) {
307307
capturedPacket = nil
308308
// when
309309
h := NewIBCRawPacketHandler(capturePacketsSenderMock, spec.chanKeeper, spec.capKeeper)
310-
evts, data, gotErr := h.DispatchMsg(ctx, RandomAccountAddress(t), ibcPort, wasmvmtypes.CosmosMsg{IBC: &wasmvmtypes.IBCMsg{SendPacket: &spec.srcMsg}})
310+
evts, data, gotErr := h.DispatchMsg(ctx, RandomAccountAddress(t), ibcPort, wasmvmtypes.CosmosMsg{IBC: &wasmvmtypes.IBCMsg{SendPacket: &spec.srcMsg}}) //nolint:gosec
311311
// then
312312
require.True(t, spec.expErr.Is(gotErr), "exp %v but got %#+v", spec.expErr, gotErr)
313313
if spec.expErr != nil {
@@ -390,7 +390,7 @@ func TestBurnCoinMessageHandlerIntegration(t *testing.T) {
390390
k.wasmVM = &wasmtesting.MockWasmEngine{ExecuteFn: func(codeID wasmvm.Checksum, env wasmvmtypes.Env, info wasmvmtypes.MessageInfo, executeMsg []byte, store wasmvm.KVStore, goapi wasmvm.GoAPI, querier wasmvm.Querier, gasMeter wasmvm.GasMeter, gasLimit uint64, deserCost wasmvmtypes.UFraction) (*wasmvmtypes.Response, uint64, error) {
391391
return &wasmvmtypes.Response{
392392
Messages: []wasmvmtypes.SubMsg{
393-
{Msg: wasmvmtypes.CosmosMsg{Bank: &wasmvmtypes.BankMsg{Burn: &spec.msg}}, ReplyOn: wasmvmtypes.ReplyNever},
393+
{Msg: wasmvmtypes.CosmosMsg{Bank: &wasmvmtypes.BankMsg{Burn: &spec.msg}}, ReplyOn: wasmvmtypes.ReplyNever}, //nolint:gosec
394394
},
395395
}, 0, nil
396396
}}

‎x/wasm/keeper/keeper_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import (
1111
"testing"
1212
"time"
1313

14-
"github.com/CosmWasm/wasmd/x/wasm/keeper/testdata"
15-
1614
wasmvm "github.com/CosmWasm/wasmvm"
1715
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
1816
abci "github.com/cometbft/cometbft/abci/types"
@@ -36,6 +34,7 @@ import (
3634
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
3735
distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
3836

37+
"github.com/CosmWasm/wasmd/x/wasm/keeper/testdata"
3938
"github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
4039
"github.com/CosmWasm/wasmd/x/wasm/types"
4140
)
@@ -549,7 +548,7 @@ func TestInstantiateWithPermissions(t *testing.T) {
549548
accKeeper, bankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper
550549
fundAccounts(t, ctx, accKeeper, bankKeeper, spec.srcActor, deposit)
551550

552-
contractID, _, err := keeper.Create(ctx, myAddr, hackatomWasm, &spec.srcPermission)
551+
contractID, _, err := keeper.Create(ctx, myAddr, hackatomWasm, &spec.srcPermission) //nolint:gosec
553552
require.NoError(t, err)
554553

555554
_, _, err = keepers.ContractKeeper.Instantiate(ctx, contractID, spec.srcActor, nil, initMsgBz, "demo contract 1", nil)

‎x/wasm/keeper/msg_server_integration_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func TestUpdateParams(t *testing.T) {
132132
require.NoError(t, err)
133133

134134
// when
135-
rsp, err := wasmApp.MsgServiceRouter().Handler(&spec.src)(ctx, &spec.src)
135+
rsp, err := wasmApp.MsgServiceRouter().Handler(&spec.src)(ctx, &spec.src) //nolint:gosec
136136
require.NoError(t, err)
137137
var result types.MsgUpdateParamsResponse
138138
require.NoError(t, wasmApp.AppCodec().Unmarshal(rsp.Data, &result))
@@ -223,7 +223,7 @@ func TestAddCodeUploadParamsAddresses(t *testing.T) {
223223
require.NoError(t, err)
224224

225225
// when
226-
rsp, err := wasmApp.MsgServiceRouter().Handler(&spec.src)(ctx, &spec.src)
226+
rsp, err := wasmApp.MsgServiceRouter().Handler(&spec.src)(ctx, &spec.src) //nolint:gosec
227227
if spec.expErr {
228228
require.Error(t, err)
229229
require.Nil(t, rsp)
@@ -319,7 +319,7 @@ func TestRemoveCodeUploadParamsAddresses(t *testing.T) {
319319
require.NoError(t, err)
320320

321321
// when
322-
rsp, err := wasmApp.MsgServiceRouter().Handler(&spec.src)(ctx, &spec.src)
322+
rsp, err := wasmApp.MsgServiceRouter().Handler(&spec.src)(ctx, &spec.src) //nolint:gosec
323323
if spec.expErr {
324324
require.Error(t, err)
325325
require.Nil(t, rsp)

‎x/wasm/keeper/options_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import (
44
"reflect"
55
"testing"
66

7-
"github.com/prometheus/client_golang/prometheus"
8-
97
wasmvm "github.com/CosmWasm/wasmvm"
8+
"github.com/prometheus/client_golang/prometheus"
109
"github.com/stretchr/testify/assert"
1110
"github.com/stretchr/testify/require"
1211

‎x/wasm/keeper/proposal_integration_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import (
88
"os"
99
"testing"
1010

11-
"github.com/CosmWasm/wasmd/x/wasm/keeper/testdata"
12-
1311
wasmvm "github.com/CosmWasm/wasmvm"
1412
"github.com/stretchr/testify/assert"
1513
"github.com/stretchr/testify/require"
@@ -20,6 +18,7 @@ import (
2018
v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
2119
"github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
2220

21+
"github.com/CosmWasm/wasmd/x/wasm/keeper/testdata"
2322
"github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
2423
"github.com/CosmWasm/wasmd/x/wasm/types"
2524
)
@@ -639,7 +638,7 @@ func TestAdminProposals(t *testing.T) {
639638
},
640639
}
641640

642-
require.NoError(t, wasmKeeper.importContract(ctx, contractAddr, &spec.state, []types.Model{}, entries))
641+
require.NoError(t, wasmKeeper.importContract(ctx, contractAddr, &spec.state, []types.Model{}, entries)) //nolint:gosec
643642

644643
// when
645644
mustSubmitAndExecuteLegacyProposal(t, ctx, spec.srcProposal, otherAddress.String(), keepers)

‎x/wasm/keeper/querier_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ func TestQueryContractHistory(t *testing.T) {
522522

523523
// when
524524
q := Querier(keeper)
525-
got, err := q.ContractHistory(sdk.WrapSDKContext(xCtx), &spec.req)
525+
got, err := q.ContractHistory(sdk.WrapSDKContext(xCtx), &spec.req) //nolint:gosec
526526

527527
// then
528528
if spec.expContent == nil {
@@ -597,7 +597,7 @@ func TestQueryCodeList(t *testing.T) {
597597
}
598598
// when
599599
q := Querier(keeper)
600-
got, err := q.Codes(sdk.WrapSDKContext(xCtx), &spec.req)
600+
got, err := q.Codes(sdk.WrapSDKContext(xCtx), &spec.req) //nolint:gosec
601601

602602
// then
603603
require.NoError(t, err)
@@ -664,7 +664,7 @@ func TestQueryContractInfo(t *testing.T) {
664664
for name, spec := range specs {
665665
t.Run(name, func(t *testing.T) {
666666
xCtx, _ := ctx.CacheContext()
667-
k.storeContractInfo(xCtx, contractAddr, &spec.stored)
667+
k.storeContractInfo(xCtx, contractAddr, &spec.stored) //nolint:gosec
668668
// when
669669
gotRsp, gotErr := querier.ContractInfo(sdk.WrapSDKContext(xCtx), spec.src)
670670
if spec.expErr {

0 commit comments

Comments
 (0)