From fe9f412063855b2cd57bfc4520ea6654ec36dc16 Mon Sep 17 00:00:00 2001 From: bizk Date: Tue, 24 Oct 2023 20:07:29 -0300 Subject: [PATCH] linter fixes --- .../bank/keeper/deterministic_test.go | 40 ++++++------- .../staking/keeper/deterministic_test.go | 56 +++++++++---------- testutil/testdata/grpc_query.go | 2 +- x/auth/keeper/deterministic_test.go | 28 +++++----- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/tests/integration/bank/keeper/deterministic_test.go b/tests/integration/bank/keeper/deterministic_test.go index 5f7a48199bd7..cd5125f75e40 100644 --- a/tests/integration/bank/keeper/deterministic_test.go +++ b/tests/integration/bank/keeper/deterministic_test.go @@ -147,12 +147,12 @@ func TestGRPCQueryBalance(t *testing.T) { req := banktypes.NewQueryBalanceRequest(addr, coin.GetDenom()) - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.Balance, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Balance, 0, true) }) fundAccount(f, addr1, coin1) req := banktypes.NewQueryBalanceRequest(addr1, coin1.GetDenom()) - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.Balance, 1087, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Balance, 1087, false) } func TestGRPCQueryAllBalances(t *testing.T) { @@ -174,7 +174,7 @@ func TestGRPCQueryAllBalances(t *testing.T) { fundAccount(f, addr, coins...) req := banktypes.NewQueryAllBalancesRequest(addr, testdata.PaginationGenerator(rt, uint64(numCoins)).Draw(rt, "pagination"), false) - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.AllBalances, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.AllBalances, 0, true) }) coins := sdk.NewCoins( @@ -185,7 +185,7 @@ func TestGRPCQueryAllBalances(t *testing.T) { fundAccount(f, addr1, coins...) req := banktypes.NewQueryAllBalancesRequest(addr1, nil, false) - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.AllBalances, 357, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.AllBalances, 357, false) } func TestGRPCQuerySpendableBalances(t *testing.T) { @@ -212,7 +212,7 @@ func TestGRPCQuerySpendableBalances(t *testing.T) { assert.NilError(t, err) req := banktypes.NewQuerySpendableBalancesRequest(addr, testdata.PaginationGenerator(rt, uint64(len(denoms))).Draw(rt, "pagination")) - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.SpendableBalances, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.SpendableBalances, 0, true) }) coins := sdk.NewCoins( @@ -224,7 +224,7 @@ func TestGRPCQuerySpendableBalances(t *testing.T) { assert.NilError(t, err) req := banktypes.NewQuerySpendableBalancesRequest(addr1, nil) - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.SpendableBalances, 2032, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.SpendableBalances, 2032, false) } func TestGRPCQueryTotalSupply(t *testing.T) { @@ -256,7 +256,7 @@ func TestGRPCQueryTotalSupply(t *testing.T) { Pagination: testdata.PaginationGenerator(rt, uint64(len(initialSupply))).Draw(rt, "pagination"), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.TotalSupply, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.TotalSupply, 0, true) }) f = initDeterministicFixture(t) // reset @@ -269,7 +269,7 @@ func TestGRPCQueryTotalSupply(t *testing.T) { assert.NilError(t, f.bankKeeper.MintCoins(f.ctx, minttypes.ModuleName, coins)) req := &banktypes.QueryTotalSupplyRequest{} - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.TotalSupply, 150, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.TotalSupply, 150, false) } func TestGRPCQueryTotalSupplyOf(t *testing.T) { @@ -285,14 +285,14 @@ func TestGRPCQueryTotalSupplyOf(t *testing.T) { assert.NilError(t, f.bankKeeper.MintCoins(f.ctx, minttypes.ModuleName, sdk.NewCoins(coin))) req := &banktypes.QuerySupplyOfRequest{Denom: coin.GetDenom()} - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.SupplyOf, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.SupplyOf, 0, true) }) coin := sdk.NewCoin("bar", math.NewInt(100)) assert.NilError(t, f.bankKeeper.MintCoins(f.ctx, minttypes.ModuleName, sdk.NewCoins(coin))) req := &banktypes.QuerySupplyOfRequest{Denom: coin.GetDenom()} - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.SupplyOf, 1021, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.SupplyOf, 1021, false) } func TestGRPCQueryParams(t *testing.T) { @@ -314,7 +314,7 @@ func TestGRPCQueryParams(t *testing.T) { assert.NilError(t, err) req := &banktypes.QueryParamsRequest{} - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.Params, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Params, 0, true) }) enabledStatus := banktypes.SendEnabled{ @@ -330,7 +330,7 @@ func TestGRPCQueryParams(t *testing.T) { err := f.bankKeeper.SetParams(f.ctx, params) assert.NilError(t, err) req := &banktypes.QueryParamsRequest{} - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.Params, 1003, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Params, 1003, false) } func createAndReturnMetadatas(t *rapid.T, count int) []banktypes.Metadata { @@ -385,7 +385,7 @@ func TestGRPCDenomsMetadata(t *testing.T) { Pagination: testdata.PaginationGenerator(rt, uint64(count)).Draw(rt, "pagination"), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DenomsMetadata, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DenomsMetadata, 0, true) }) f = initDeterministicFixture(t) // reset @@ -393,7 +393,7 @@ func TestGRPCDenomsMetadata(t *testing.T) { f.bankKeeper.SetDenomMetaData(f.ctx, metadataAtom) req := &banktypes.QueryDenomsMetadataRequest{} - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DenomsMetadata, 660, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DenomsMetadata, 660, false) } func TestGRPCDenomMetadata(t *testing.T) { @@ -409,7 +409,7 @@ func TestGRPCDenomMetadata(t *testing.T) { Denom: denomMetadata[0].Base, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DenomMetadata, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DenomMetadata, 0, true) }) f.bankKeeper.SetDenomMetaData(f.ctx, metadataAtom) @@ -418,7 +418,7 @@ func TestGRPCDenomMetadata(t *testing.T) { Denom: metadataAtom.Base, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DenomMetadata, 1300, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DenomMetadata, 1300, false) } func TestGRPCSendEnabled(t *testing.T) { @@ -448,7 +448,7 @@ func TestGRPCSendEnabled(t *testing.T) { // Pagination is only taken into account when `denoms` is an empty array Pagination: testdata.PaginationGenerator(rt, uint64(len(allDenoms))).Draw(rt, "pagination"), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.SendEnabled, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.SendEnabled, 0, true) }) coin1 := banktypes.SendEnabled{ @@ -467,7 +467,7 @@ func TestGRPCSendEnabled(t *testing.T) { Denoms: []string{coin1.GetDenom(), coin2.GetDenom()}, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.SendEnabled, 4063, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.SendEnabled, 4063, false) } func TestGRPCDenomOwners(t *testing.T) { @@ -493,7 +493,7 @@ func TestGRPCDenomOwners(t *testing.T) { Denom: denom, Pagination: testdata.PaginationGenerator(rt, uint64(numAddr)).Draw(rt, "pagination"), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DenomOwners, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DenomOwners, 0, true) }) denomOwners := []*banktypes.DenomOwner{ @@ -518,5 +518,5 @@ func TestGRPCDenomOwners(t *testing.T) { req := &banktypes.QueryDenomOwnersRequest{ Denom: coin1.GetDenom(), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DenomOwners, 2516, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DenomOwners, 2516, false) } diff --git a/tests/integration/staking/keeper/deterministic_test.go b/tests/integration/staking/keeper/deterministic_test.go index d0bd14058196..446a87afb42f 100644 --- a/tests/integration/staking/keeper/deterministic_test.go +++ b/tests/integration/staking/keeper/deterministic_test.go @@ -348,7 +348,7 @@ func TestGRPCValidator(t *testing.T) { ValidatorAddr: val.OperatorAddress, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.Validator, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Validator, 0, true) }) f = initDeterministicFixture(t) // reset @@ -357,7 +357,7 @@ func TestGRPCValidator(t *testing.T) { ValidatorAddr: val.OperatorAddress, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.Validator, 1915, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Validator, 1915, false) } func TestGRPCValidators(t *testing.T) { @@ -376,14 +376,14 @@ func TestGRPCValidators(t *testing.T) { Pagination: testdata.PaginationGenerator(rt, uint64(valsCount)).Draw(rt, "pagination"), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.Validators, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Validators, 0, true) }) f = initDeterministicFixture(t) // reset getStaticValidator(t, f) getStaticValidator2(t, f) - testdata.DeterministicIterations(f.ctx, t, &stakingtypes.QueryValidatorsRequest{}, f.queryClient.Validators, 2862, false) + testdata.DeterministicIterations(t, f.ctx, &stakingtypes.QueryValidatorsRequest{}, f.queryClient.Validators, 2862, false) } func TestGRPCValidatorDelegations(t *testing.T) { @@ -405,7 +405,7 @@ func TestGRPCValidatorDelegations(t *testing.T) { Pagination: testdata.PaginationGenerator(rt, uint64(numDels)).Draw(rt, "pagination"), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.ValidatorDelegations, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.ValidatorDelegations, 0, true) }) f = initDeterministicFixture(t) // reset @@ -422,7 +422,7 @@ func TestGRPCValidatorDelegations(t *testing.T) { ValidatorAddr: validator.OperatorAddress, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.ValidatorDelegations, 14637, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.ValidatorDelegations, 14637, false) } func TestGRPCValidatorUnbondingDelegations(t *testing.T) { @@ -448,7 +448,7 @@ func TestGRPCValidatorUnbondingDelegations(t *testing.T) { Pagination: testdata.PaginationGenerator(rt, uint64(numDels)).Draw(rt, "pagination"), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.ValidatorUnbondingDelegations, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.ValidatorUnbondingDelegations, 0, true) }) f = initDeterministicFixture(t) // reset @@ -470,7 +470,7 @@ func TestGRPCValidatorUnbondingDelegations(t *testing.T) { ValidatorAddr: validator.OperatorAddress, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.ValidatorUnbondingDelegations, 3719, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.ValidatorUnbondingDelegations, 3719, false) } func TestGRPCDelegation(t *testing.T) { @@ -488,7 +488,7 @@ func TestGRPCDelegation(t *testing.T) { DelegatorAddr: delegator.String(), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.Delegation, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Delegation, 0, true) }) f = initDeterministicFixture(t) // reset @@ -502,7 +502,7 @@ func TestGRPCDelegation(t *testing.T) { DelegatorAddr: delegator1, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.Delegation, 4689, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Delegation, 4689, false) } func TestGRPCUnbondingDelegation(t *testing.T) { @@ -525,7 +525,7 @@ func TestGRPCUnbondingDelegation(t *testing.T) { DelegatorAddr: delegator.String(), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.UnbondingDelegation, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.UnbondingDelegation, 0, true) }) f = initDeterministicFixture(t) // reset @@ -542,7 +542,7 @@ func TestGRPCUnbondingDelegation(t *testing.T) { DelegatorAddr: delegator1, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.UnbondingDelegation, 1621, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.UnbondingDelegation, 1621, false) } func TestGRPCDelegatorDelegations(t *testing.T) { @@ -564,7 +564,7 @@ func TestGRPCDelegatorDelegations(t *testing.T) { Pagination: testdata.PaginationGenerator(rt, uint64(numVals)).Draw(rt, "pagination"), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DelegatorDelegations, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DelegatorDelegations, 0, true) }) f = initDeterministicFixture(t) // reset @@ -577,7 +577,7 @@ func TestGRPCDelegatorDelegations(t *testing.T) { DelegatorAddr: delegator1, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DelegatorDelegations, 4292, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DelegatorDelegations, 4292, false) } func TestGRPCDelegatorValidator(t *testing.T) { @@ -596,7 +596,7 @@ func TestGRPCDelegatorValidator(t *testing.T) { ValidatorAddr: validator.OperatorAddress, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DelegatorValidator, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DelegatorValidator, 0, true) }) f = initDeterministicFixture(t) // reset @@ -611,7 +611,7 @@ func TestGRPCDelegatorValidator(t *testing.T) { ValidatorAddr: validator.OperatorAddress, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DelegatorValidator, 3563, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DelegatorValidator, 3563, false) } func TestGRPCDelegatorUnbondingDelegations(t *testing.T) { @@ -637,7 +637,7 @@ func TestGRPCDelegatorUnbondingDelegations(t *testing.T) { Pagination: testdata.PaginationGenerator(rt, uint64(numVals)).Draw(rt, "pagination"), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DelegatorUnbondingDelegations, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DelegatorUnbondingDelegations, 0, true) }) f = initDeterministicFixture(t) // reset @@ -653,7 +653,7 @@ func TestGRPCDelegatorUnbondingDelegations(t *testing.T) { DelegatorAddr: delegator1, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DelegatorUnbondingDelegations, 1302, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DelegatorUnbondingDelegations, 1302, false) } func TestGRPCHistoricalInfo(t *testing.T) { @@ -675,7 +675,7 @@ func TestGRPCHistoricalInfo(t *testing.T) { Height: height, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.HistoricalInfo, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.HistoricalInfo, 0, true) }) f = initDeterministicFixture(t) // reset @@ -694,7 +694,7 @@ func TestGRPCHistoricalInfo(t *testing.T) { Height: height, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.HistoricalInfo, 1027, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.HistoricalInfo, 1027, false) } func TestGRPCDelegatorValidators(t *testing.T) { @@ -716,7 +716,7 @@ func TestGRPCDelegatorValidators(t *testing.T) { Pagination: testdata.PaginationGenerator(rt, uint64(numVals)).Draw(rt, "pagination"), } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DelegatorValidators, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DelegatorValidators, 0, true) }) f = initDeterministicFixture(t) // reset @@ -727,7 +727,7 @@ func TestGRPCDelegatorValidators(t *testing.T) { assert.NilError(t, err) req := &stakingtypes.QueryDelegatorValidatorsRequest{DelegatorAddr: delegator1} - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.DelegatorValidators, 3166, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DelegatorValidators, 3166, false) } func TestGRPCPool(t *testing.T) { @@ -737,12 +737,12 @@ func TestGRPCPool(t *testing.T) { rapid.Check(t, func(rt *rapid.T) { createAndSetValidator(t, rt, f) - testdata.DeterministicIterations(f.ctx, t, &stakingtypes.QueryPoolRequest{}, f.queryClient.Pool, 0, true) + testdata.DeterministicIterations(t, f.ctx, &stakingtypes.QueryPoolRequest{}, f.queryClient.Pool, 0, true) }) f = initDeterministicFixture(t) // reset getStaticValidator(t, f) - testdata.DeterministicIterations(f.ctx, t, &stakingtypes.QueryPoolRequest{}, f.queryClient.Pool, 6296, false) + testdata.DeterministicIterations(t, f.ctx, &stakingtypes.QueryPoolRequest{}, f.queryClient.Pool, 6296, false) } func TestGRPCRedelegations(t *testing.T) { @@ -788,7 +788,7 @@ func TestGRPCRedelegations(t *testing.T) { } req.Pagination = testdata.PaginationGenerator(rt, uint64(numDels)).Draw(rt, "pagination") - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.Redelegations, 0, true) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Redelegations, 0, true) }) f = initDeterministicFixture(t) // reset @@ -807,7 +807,7 @@ func TestGRPCRedelegations(t *testing.T) { DstValidatorAddr: validator2, } - testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.Redelegations, 3920, false) + testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Redelegations, 3920, false) } func TestGRPCParams(t *testing.T) { @@ -829,7 +829,7 @@ func TestGRPCParams(t *testing.T) { err := f.stakingKeeper.Params.Set(f.ctx, params) assert.NilError(t, err) - testdata.DeterministicIterations(f.ctx, t, &stakingtypes.QueryParamsRequest{}, f.queryClient.Params, 0, true) + testdata.DeterministicIterations(t, f.ctx, &stakingtypes.QueryParamsRequest{}, f.queryClient.Params, 0, true) }) params := stakingtypes.Params{ @@ -845,5 +845,5 @@ func TestGRPCParams(t *testing.T) { err := f.stakingKeeper.Params.Set(f.ctx, params) assert.NilError(t, err) - testdata.DeterministicIterations(f.ctx, t, &stakingtypes.QueryParamsRequest{}, f.queryClient.Params, 1162, false) + testdata.DeterministicIterations(t, f.ctx, &stakingtypes.QueryParamsRequest{}, f.queryClient.Params, 1162, false) } diff --git a/testutil/testdata/grpc_query.go b/testutil/testdata/grpc_query.go index 9b61713c5601..756092634540 100644 --- a/testutil/testdata/grpc_query.go +++ b/testutil/testdata/grpc_query.go @@ -66,8 +66,8 @@ func (m *TestAnyResponse) UnpackInterfaces(unpacker types.AnyUnpacker) error { // `gasOverwrite` is set to true, we also check that this consumed // gas value is equal to the hardcoded `gasConsumed`. func DeterministicIterations[request, response proto.Message]( - ctx sdk.Context, t *testing.T, + ctx sdk.Context, req request, grpcFn func(context.Context, request, ...grpc.CallOption) (response, error), gasConsumed uint64, diff --git a/x/auth/keeper/deterministic_test.go b/x/auth/keeper/deterministic_test.go index 630fa173fd4c..b1dcd78a184c 100644 --- a/x/auth/keeper/deterministic_test.go +++ b/x/auth/keeper/deterministic_test.go @@ -120,7 +120,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryAccount() { rapid.Check(suite.T(), func(t *rapid.T) { accs := suite.createAndSetAccounts(t, 1) req := &types.QueryAccountRequest{Address: accs[0].GetAddress().String()} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, suite.queryClient.Account, 0, true) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, suite.queryClient.Account, 0, true) }) // Regression tests @@ -132,7 +132,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryAccount() { req := &types.QueryAccountRequest{Address: acc1.GetAddress().String()} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, suite.queryClient.Account, 1543, false) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, suite.queryClient.Account, 1543, false) } // pubkeyGenerator creates and returns a random pubkey generator using rapid. @@ -149,7 +149,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryAccounts() { accs := suite.createAndSetAccounts(t, numAccs) req := &types.QueryAccountsRequest{Pagination: testdata.PaginationGenerator(t, uint64(numAccs)).Draw(t, "accounts")} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, suite.queryClient.Accounts, 0, true) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, suite.queryClient.Accounts, 0, true) for i := 0; i < numAccs; i++ { suite.accountKeeper.RemoveAccount(suite.ctx, accs[i]) @@ -174,14 +174,14 @@ func (suite *DeterministicTestSuite) TestGRPCQueryAccounts() { suite.accountKeeper.SetAccount(suite.ctx, acc2) req := &types.QueryAccountsRequest{} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, suite.queryClient.Accounts, 1716, false) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, suite.queryClient.Accounts, 1716, false) } func (suite *DeterministicTestSuite) TestGRPCQueryAccountAddressByID() { rapid.Check(suite.T(), func(t *rapid.T) { accs := suite.createAndSetAccounts(t, 1) req := &types.QueryAccountAddressByIDRequest{AccountId: accs[0].GetAccountNumber()} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, suite.queryClient.AccountAddressByID, 0, true) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, suite.queryClient.AccountAddressByID, 0, true) }) // Regression test @@ -192,7 +192,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryAccountAddressByID() { suite.accountKeeper.SetAccount(suite.ctx, acc1) req := &types.QueryAccountAddressByIDRequest{AccountId: accNum} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, suite.queryClient.AccountAddressByID, 1123, false) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, suite.queryClient.AccountAddressByID, 1123, false) } func (suite *DeterministicTestSuite) TestGRPCQueryParameters() { @@ -208,7 +208,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryParameters() { suite.Require().NoError(err) req := &types.QueryParamsRequest{} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, suite.queryClient.Params, 0, true) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, suite.queryClient.Params, 0, true) }) // Regression test @@ -218,7 +218,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryParameters() { suite.Require().NoError(err) req := &types.QueryParamsRequest{} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, suite.queryClient.Params, 1042, false) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, suite.queryClient.Params, 1042, false) } func (suite *DeterministicTestSuite) TestGRPCQueryAccountInfo() { @@ -227,7 +227,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryAccountInfo() { suite.Require().Len(accs, 1) req := &types.QueryAccountInfoRequest{Address: accs[0].GetAddress().String()} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, suite.queryClient.AccountInfo, 0, true) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, suite.queryClient.AccountInfo, 0, true) }) // Regression test @@ -238,7 +238,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryAccountInfo() { suite.accountKeeper.SetAccount(suite.ctx, acc) req := &types.QueryAccountInfoRequest{Address: acc.GetAddress().String()} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, suite.queryClient.AccountInfo, 1543, false) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, suite.queryClient.AccountInfo, 1543, false) } func (suite *DeterministicTestSuite) createAndReturnQueryClient(ak keeper.AccountKeeper) types.QueryClient { @@ -301,7 +301,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryModuleAccounts() { queryClient := suite.createAndReturnQueryClient(ak) req := &types.QueryModuleAccountsRequest{} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, queryClient.ModuleAccounts, 0, true) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, queryClient.ModuleAccounts, 0, true) }) maccs := make([]string, 0, len(suite.maccPerms)) @@ -313,7 +313,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryModuleAccounts() { queryClient := suite.createAndReturnQueryClient(suite.accountKeeper) req := &types.QueryModuleAccountsRequest{} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, queryClient.ModuleAccounts, 8565, false) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, queryClient.ModuleAccounts, 8565, false) } func (suite *DeterministicTestSuite) TestGRPCQueryModuleAccountByName() { @@ -348,7 +348,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryModuleAccountByName() { queryClient := suite.createAndReturnQueryClient(ak) req := &types.QueryModuleAccountByNameRequest{Name: mName} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, queryClient.ModuleAccountByName, 0, true) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, queryClient.ModuleAccountByName, 0, true) }) maccs := make([]string, 0, len(suite.maccPerms)) @@ -360,5 +360,5 @@ func (suite *DeterministicTestSuite) TestGRPCQueryModuleAccountByName() { queryClient := suite.createAndReturnQueryClient(suite.accountKeeper) req := &types.QueryModuleAccountByNameRequest{Name: "mint"} - testdata.DeterministicIterations(suite.ctx, suite.T(), req, queryClient.ModuleAccountByName, 1372, false) + testdata.DeterministicIterations(suite.T(), suite.ctx, req, queryClient.ModuleAccountByName, 1372, false) }