Skip to content

Commit 0ff3c79

Browse files
DongLieuDongLieu
committed
only lint gov
1 parent e608651 commit 0ff3c79

27 files changed

+149
-99
lines changed

‎x/gov/abci_test.go

+31-14
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,11 @@ func TestTickExpiredDepositPeriod(t *testing.T) {
8787
ctx := app.BaseApp.NewContext(false)
8888
addrs := simtestutil.AddTestAddrs(suite.BankKeeper, suite.StakingKeeper, ctx, 10, valTokens)
8989

90-
app.FinalizeBlock(&abci.RequestFinalizeBlock{
90+
_, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{
9191
Height: app.LastBlockHeight() + 1,
9292
Hash: app.LastCommitID().Hash,
9393
})
94+
require.NoError(t, err)
9495

9596
govMsgSvr := keeper.NewMsgServerImpl(suite.GovKeeper)
9697

@@ -138,10 +139,11 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) {
138139
ctx := app.BaseApp.NewContext(false)
139140
addrs := simtestutil.AddTestAddrs(suite.BankKeeper, suite.StakingKeeper, ctx, 10, valTokens)
140141

141-
app.FinalizeBlock(&abci.RequestFinalizeBlock{
142+
_, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{
142143
Height: app.LastBlockHeight() + 1,
143144
Hash: app.LastCommitID().Hash,
144145
})
146+
require.NoError(t, err)
145147

146148
govMsgSvr := keeper.NewMsgServerImpl(suite.GovKeeper)
147149

@@ -209,10 +211,11 @@ func TestTickPassedDepositPeriod(t *testing.T) {
209211
ctx := app.BaseApp.NewContext(false)
210212
addrs := simtestutil.AddTestAddrs(suite.BankKeeper, suite.StakingKeeper, ctx, 10, valTokens)
211213

212-
app.FinalizeBlock(&abci.RequestFinalizeBlock{
214+
_, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{
213215
Height: app.LastBlockHeight() + 1,
214216
Hash: app.LastCommitID().Hash,
215217
})
218+
require.NoError(t, err)
216219

217220
govMsgSvr := keeper.NewMsgServerImpl(suite.GovKeeper)
218221

@@ -274,10 +277,11 @@ func TestTickPassedVotingPeriod(t *testing.T) {
274277

275278
SortAddresses(addrs)
276279

277-
app.FinalizeBlock(&abci.RequestFinalizeBlock{
280+
_, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{
278281
Height: app.LastBlockHeight() + 1,
279282
Hash: app.LastCommitID().Hash,
280283
})
284+
require.NoError(t, err)
281285

282286
govMsgSvr := keeper.NewMsgServerImpl(suite.GovKeeper)
283287

@@ -368,16 +372,18 @@ func TestProposalPassedEndblocker(t *testing.T) {
368372
govMsgSvr := keeper.NewMsgServerImpl(suite.GovKeeper)
369373
stakingMsgSvr := stakingkeeper.NewMsgServerImpl(suite.StakingKeeper)
370374

371-
app.FinalizeBlock(&abci.RequestFinalizeBlock{
375+
_, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{
372376
Height: app.LastBlockHeight() + 1,
373377
Hash: app.LastCommitID().Hash,
374378
})
379+
require.NoError(t, err)
375380

376381
valAddr := sdk.ValAddress(addrs[0])
377382
proposer := addrs[0]
378383

379384
createValidators(t, stakingMsgSvr, ctx, []sdk.ValAddress{valAddr}, []int64{10})
380-
suite.StakingKeeper.EndBlocker(ctx)
385+
_, err = suite.StakingKeeper.EndBlocker(ctx)
386+
require.NoError(t, err)
381387

382388
macc := suite.GovKeeper.GetGovernanceAccount(ctx)
383389
require.NotNil(t, macc)
@@ -408,7 +414,8 @@ func TestProposalPassedEndblocker(t *testing.T) {
408414
newHeader.Time = ctx.BlockHeader().Time.Add(*params.MaxDepositPeriod).Add(*params.VotingPeriod)
409415
ctx = ctx.WithBlockHeader(newHeader)
410416

411-
gov.EndBlocker(ctx, suite.GovKeeper)
417+
err = gov.EndBlocker(ctx, suite.GovKeeper)
418+
require.NoError(t, err)
412419

413420
macc = suite.GovKeeper.GetGovernanceAccount(ctx)
414421
require.NotNil(t, macc)
@@ -427,16 +434,18 @@ func TestEndBlockerProposalHandlerFailed(t *testing.T) {
427434

428435
stakingMsgSvr := stakingkeeper.NewMsgServerImpl(suite.StakingKeeper)
429436

430-
app.FinalizeBlock(&abci.RequestFinalizeBlock{
437+
_, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{
431438
Height: app.LastBlockHeight() + 1,
432439
Hash: app.LastCommitID().Hash,
433440
})
441+
require.NoError(t, err)
434442

435443
valAddr := sdk.ValAddress(addrs[0])
436444
proposer := addrs[0]
437445

438446
createValidators(t, stakingMsgSvr, ctx, []sdk.ValAddress{valAddr}, []int64{10})
439-
suite.StakingKeeper.EndBlocker(ctx)
447+
_, err = suite.StakingKeeper.EndBlocker(ctx)
448+
require.NoError(t, err)
440449

441450
msg := banktypes.NewMsgSend(authtypes.NewModuleAddress(types.ModuleName), addrs[0], sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(100000))))
442451
proposal, err := suite.GovKeeper.SubmitProposal(ctx, []sdk.Msg{msg}, "", "title", "summary", proposer, false)
@@ -459,7 +468,8 @@ func TestEndBlockerProposalHandlerFailed(t *testing.T) {
459468
ctx = ctx.WithBlockHeader(newHeader)
460469

461470
// validate that the proposal fails/has been rejected
462-
gov.EndBlocker(ctx, suite.GovKeeper)
471+
err = gov.EndBlocker(ctx, suite.GovKeeper)
472+
require.NoError(t, err)
463473

464474
// check proposal events
465475
events := ctx.EventManager().Events()
@@ -511,17 +521,19 @@ func TestExpeditedProposal_PassAndConversionToRegular(t *testing.T) {
511521
govMsgSvr := keeper.NewMsgServerImpl(suite.GovKeeper)
512522
stakingMsgSvr := stakingkeeper.NewMsgServerImpl(suite.StakingKeeper)
513523

514-
app.FinalizeBlock(&abci.RequestFinalizeBlock{
524+
_, err = app.FinalizeBlock(&abci.RequestFinalizeBlock{
515525
Height: app.LastBlockHeight() + 1,
516526
Hash: app.LastCommitID().Hash,
517527
})
528+
require.NoError(t, err)
518529

519530
valAddr := sdk.ValAddress(addrs[0])
520531
proposer := addrs[0]
521532

522533
// Create a validator so that able to vote on proposal.
523534
createValidators(t, stakingMsgSvr, ctx, []sdk.ValAddress{valAddr}, []int64{10})
524-
suite.StakingKeeper.EndBlocker(ctx)
535+
_, err = suite.StakingKeeper.EndBlocker(ctx)
536+
require.NoError(t, err)
525537

526538
checkInactiveProposalsQueue(t, ctx, suite.GovKeeper)
527539
checkActiveProposalsQueue(t, ctx, suite.GovKeeper)
@@ -571,7 +583,8 @@ func TestExpeditedProposal_PassAndConversionToRegular(t *testing.T) {
571583
}
572584

573585
// Here the expedited proposal is converted to regular after expiry.
574-
gov.EndBlocker(ctx, suite.GovKeeper)
586+
err = gov.EndBlocker(ctx, suite.GovKeeper)
587+
require.NoError(t, err)
575588

576589
if tc.expeditedPasses {
577590
checkActiveProposalsQueue(t, ctx, suite.GovKeeper)
@@ -626,7 +639,8 @@ func TestExpeditedProposal_PassAndConversionToRegular(t *testing.T) {
626639
}
627640

628641
// Here we validate the converted regular proposal
629-
gov.EndBlocker(ctx, suite.GovKeeper)
642+
err = gov.EndBlocker(ctx, suite.GovKeeper)
643+
require.NoError(t, err)
630644

631645
macc = suite.GovKeeper.GetGovernanceAccount(ctx)
632646
require.NotNil(t, macc)
@@ -661,6 +675,7 @@ func TestExpeditedProposal_PassAndConversionToRegular(t *testing.T) {
661675
}
662676

663677
func createValidators(t *testing.T, stakingMsgSvr stakingtypes.MsgServer, ctx sdk.Context, addrs []sdk.ValAddress, powerAmt []int64) {
678+
t.Helper()
664679
require.True(t, len(addrs) <= len(pubkeys), "Not enough pubkeys specified at top of file.")
665680

666681
for i := 0; i < len(addrs); i++ {
@@ -688,6 +703,7 @@ func getDepositMultiplier(expedited bool) int64 {
688703
}
689704

690705
func checkActiveProposalsQueue(t *testing.T, ctx sdk.Context, k *keeper.Keeper) {
706+
t.Helper()
691707
err := k.ActiveProposalsQueue.Walk(ctx, collections.NewPrefixUntilPairRange[time.Time, uint64](ctx.BlockTime()), func(key collections.Pair[time.Time, uint64], value uint64) (stop bool, err error) {
692708
return false, err
693709
})
@@ -696,6 +712,7 @@ func checkActiveProposalsQueue(t *testing.T, ctx sdk.Context, k *keeper.Keeper)
696712
}
697713

698714
func checkInactiveProposalsQueue(t *testing.T, ctx sdk.Context, k *keeper.Keeper) {
715+
t.Helper()
699716
err := k.InactiveProposalsQueue.Walk(ctx, collections.NewPrefixUntilPairRange[time.Time, uint64](ctx.BlockTime()), func(key collections.Pair[time.Time, uint64], value uint64) (stop bool, err error) {
700717
return false, err
701718
})

‎x/gov/client/cli/prompt_test.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ func TestPromptIntegerOverflow(t *testing.T) {
4747

4848
fin, fw := readline.NewFillableStdin(os.Stdin)
4949
readline.Stdin = fin
50-
fw.Write([]byte(overflowStr + "\n"))
50+
_, err := fw.Write([]byte(overflowStr + "\n"))
51+
require.NoError(t, err)
5152

5253
v, err := cli.Prompt(st{}, "")
5354
assert.Equal(t, st{}, v, "expected a value of zero")
@@ -69,7 +70,7 @@ func TestPromptParseInteger(t *testing.T) {
6970
}
7071

7172
for _, tc := range values {
72-
tc := tc
73+
7374
t.Run(tc.in, func(t *testing.T) {
7475
origStdin := readline.Stdin
7576
defer func() {
@@ -78,7 +79,8 @@ func TestPromptParseInteger(t *testing.T) {
7879

7980
fin, fw := readline.NewFillableStdin(os.Stdin)
8081
readline.Stdin = fin
81-
fw.Write([]byte(tc.in + "\n"))
82+
_, err := fw.Write([]byte(tc.in + "\n"))
83+
assert.NoError(t, err)
8284

8385
v, err := cli.Prompt(st{}, "")
8486
assert.Nil(t, err, "expected a nil error")

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ func (s *CLITestSuite) TestNewCmdSubmitProposal() {
155155
}
156156

157157
for _, tc := range testCases {
158-
tc := tc
159158

160159
s.Run(tc.name, func() {
161160
cmd := cli.NewCmdSubmitProposal()
@@ -249,7 +248,6 @@ func (s *CLITestSuite) TestNewCmdSubmitLegacyProposal() {
249248
}
250249

251250
for _, tc := range testCases {
252-
tc := tc
253251

254252
s.Run(tc.name, func() {
255253
cmd := cli.NewCmdSubmitLegacyProposal()
@@ -314,7 +312,6 @@ func (s *CLITestSuite) TestNewCmdDeposit() {
314312
}
315313

316314
for _, tc := range testCases {
317-
tc := tc
318315

319316
s.Run(tc.name, func() {
320317
cmd := cli.NewCmdDeposit()
@@ -393,7 +390,7 @@ func (s *CLITestSuite) TestNewCmdVote() {
393390
}
394391

395392
for _, tc := range testCases {
396-
tc := tc
393+
397394
s.Run(tc.name, func() {
398395
cmd := cli.NewCmdVote()
399396
out, err := clitestutil.ExecTestCLICmd(s.clientCtx, cmd, tc.args)
@@ -494,7 +491,7 @@ func (s *CLITestSuite) TestNewCmdWeightedVote() {
494491
}
495492

496493
for _, tc := range testCases {
497-
tc := tc
494+
498495
s.Run(tc.name, func() {
499496
cmd := cli.NewCmdWeightedVote()
500497
out, err := clitestutil.ExecTestCLICmd(s.clientCtx, cmd, tc.args)

‎x/gov/client/cli/util_test.go

+22-11
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,20 @@ func TestParseSubmitLegacyProposal(t *testing.T) {
4141
fs := NewCmdSubmitLegacyProposal().Flags()
4242

4343
// nonexistent json
44-
fs.Set(FlagProposal, "fileDoesNotExist")
45-
_, err := parseSubmitLegacyProposal(fs)
44+
err := fs.Set(FlagProposal, "fileDoesNotExist")
45+
require.NoError(t, err)
46+
_, err = parseSubmitLegacyProposal(fs)
4647
require.Error(t, err)
4748

4849
// invalid json
49-
fs.Set(FlagProposal, badJSON.Name())
50+
err = fs.Set(FlagProposal, badJSON.Name())
51+
require.NoError(t, err)
5052
_, err = parseSubmitLegacyProposal(fs)
5153
require.Error(t, err)
5254

5355
// ok json
54-
fs.Set(FlagProposal, okJSON.Name())
56+
err = fs.Set(FlagProposal, okJSON.Name())
57+
require.NoError(t, err)
5558
proposal1, err := parseSubmitLegacyProposal(fs)
5659
require.Nil(t, err, "unexpected error")
5760
require.Equal(t, "Test Proposal", proposal1.Title)
@@ -61,14 +64,17 @@ func TestParseSubmitLegacyProposal(t *testing.T) {
6164

6265
// flags that can't be used with --proposal
6366
for _, incompatibleFlag := range ProposalFlags {
64-
fs.Set(incompatibleFlag, "some value")
67+
err = fs.Set(incompatibleFlag, "some value")
68+
require.NoError(t, err)
6569
_, err := parseSubmitLegacyProposal(fs)
6670
require.Error(t, err)
67-
fs.Set(incompatibleFlag, "")
71+
err = fs.Set(incompatibleFlag, "")
72+
require.NoError(t, err)
6873
}
6974

7075
// no --proposal, only flags
71-
fs.Set(FlagProposal, "")
76+
err = fs.Set(FlagProposal, "")
77+
require.NoError(t, err)
7278
flagTestCases := map[string]struct {
7379
pTitle string
7480
pDescription string
@@ -102,10 +108,14 @@ func TestParseSubmitLegacyProposal(t *testing.T) {
102108
}
103109
for name, tc := range flagTestCases {
104110
t.Run(name, func(t *testing.T) {
105-
fs.Set(FlagTitle, tc.pTitle)
106-
fs.Set(FlagDescription, tc.pDescription)
107-
fs.Set(FlagProposalType, tc.pType)
108-
fs.Set(FlagDeposit, proposal1.Deposit)
111+
err = fs.Set(FlagTitle, tc.pTitle)
112+
require.NoError(t, err)
113+
err = fs.Set(FlagDescription, tc.pDescription)
114+
require.NoError(t, err)
115+
err = fs.Set(FlagProposalType, tc.pType)
116+
require.NoError(t, err)
117+
err = fs.Set(FlagDeposit, proposal1.Deposit)
118+
require.NoError(t, err)
109119
proposal2, err := parseSubmitLegacyProposal(fs)
110120

111121
if tc.expErr {
@@ -214,6 +224,7 @@ func TestParseSubmitProposal(t *testing.T) {
214224
}
215225

216226
func getCommandHelp(t *testing.T, cmd *cobra.Command) string {
227+
t.Helper()
217228
// Create a pipe, so we can capture the help sent to stdout.
218229
reader, writer, err := os.Pipe()
219230
require.NoError(t, err, "creating os.Pipe()")

‎x/gov/client/utils/query_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ func TestGetPaginatedVotes(t *testing.T) {
140140
},
141141
},
142142
} {
143-
tc := tc
144143

145144
t.Run(tc.description, func(t *testing.T) {
146145
marshaled := make([]cmttypes.Tx, len(tc.msgs))

‎x/gov/common_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ var (
4545

4646
// mkTestLegacyContent creates a MsgExecLegacyContent for testing purposes.
4747
func mkTestLegacyContent(t *testing.T) *v1.MsgExecLegacyContent {
48+
t.Helper()
4849
msgContent, err := v1.NewLegacyContent(TestProposal, authtypes.NewModuleAddress(types.ModuleName).String())
4950
require.NoError(t, err)
5051

@@ -113,6 +114,7 @@ type suite struct {
113114
}
114115

115116
func createTestSuite(t *testing.T) suite {
117+
t.Helper()
116118
res := suite{}
117119

118120
app, err := simtestutil.SetupWithConfiguration(

‎x/gov/keeper/common_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ func setupGovKeeper(t *testing.T) (
6060
moduletestutil.TestEncodingConfig,
6161
sdk.Context,
6262
) {
63+
t.Helper()
6364
key := storetypes.NewKVStoreKey(types.StoreKey)
6465
storeService := runtime.NewKVStoreService(key)
6566
testCtx := testutil.DefaultContextWithDB(t, key, storetypes.NewTransientStoreKey("transient_test"))

‎x/gov/keeper/deposit_test.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ func TestDeposits(t *testing.T) {
136136
deposit, err = govKeeper.Deposits.Get(ctx, collections.Join(proposalID, TestAddrs[1]))
137137
require.Nil(t, err)
138138
require.Equal(t, fourStake, sdk.NewCoins(deposit.Amount...))
139-
govKeeper.RefundAndDeleteDeposits(ctx, proposalID)
139+
err = govKeeper.RefundAndDeleteDeposits(ctx, proposalID)
140+
require.NoError(t, err)
140141
deposit, err = govKeeper.Deposits.Get(ctx, collections.Join(proposalID, TestAddrs[1]))
141142
require.ErrorIs(t, err, collections.ErrNotFound)
142143
require.Equal(t, addr0Initial, bankKeeper.GetAllBalances(ctx, TestAddrs[0]))
@@ -148,7 +149,8 @@ func TestDeposits(t *testing.T) {
148149
proposalID = proposal.Id
149150
_, err = govKeeper.AddDeposit(ctx, proposalID, TestAddrs[0], fourStake)
150151
require.NoError(t, err)
151-
govKeeper.DeleteAndBurnDeposits(ctx, proposalID)
152+
err = govKeeper.DeleteAndBurnDeposits(ctx, proposalID)
153+
require.NoError(t, err)
152154
deposits, _ = govKeeper.GetDeposits(ctx, proposalID)
153155
require.Len(t, deposits, 0)
154156
require.Equal(t, addr0Initial.Sub(fourStake...), bankKeeper.GetAllBalances(ctx, TestAddrs[0]))
@@ -334,9 +336,9 @@ func TestValidateInitialDeposit(t *testing.T) {
334336
}
335337
params.MinInitialDepositRatio = sdkmath.LegacyNewDec(tc.minInitialDepositPercent).Quo(sdkmath.LegacyNewDec(100)).String()
336338

337-
govKeeper.Params.Set(ctx, params)
338-
339-
err := govKeeper.ValidateInitialDeposit(ctx, tc.initialDeposit, tc.expedited)
339+
err := govKeeper.Params.Set(ctx, params)
340+
require.NoError(t, err)
341+
err = govKeeper.ValidateInitialDeposit(ctx, tc.initialDeposit, tc.expedited)
340342

341343
if tc.expectError {
342344
require.Error(t, err)

0 commit comments

Comments
 (0)