From 6239cdfddbe7b305aa69bdde4dcdf52a9011e21d Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 30 Nov 2022 01:10:50 +0100 Subject: [PATCH] chore: clean-up deprecated function usage (#14078) --- baseapp/grpcrouter.go | 2 +- baseapp/msg_service_router.go | 2 +- client/grpc/node/service_test.go | 3 +- .../slashing/keeper/keeper_test.go | 2 +- x/auth/ante/sigverify.go | 2 +- x/auth/keeper/grpc_query_test.go | 23 ++----- x/bank/keeper/grpc_query_test.go | 10 ++-- x/consensus/keeper/grpc_query_test.go | 5 +- x/evidence/keeper/grpc_query_test.go | 9 +-- x/feegrant/keeper/genesis_test.go | 2 +- x/gov/abci_test.go | 22 ++++--- x/gov/keeper/msg_server_test.go | 2 +- x/group/keeper/genesis_test.go | 2 +- x/group/keeper/grpc_query_test.go | 6 +- x/group/keeper/keeper_test.go | 60 +++++++------------ x/group/keeper/msg_server.go | 6 +- x/group/keeper/tally_test.go | 6 +- x/group/simulation/operations.go | 24 +++----- x/group/simulation/operations_test.go | 24 ++++---- x/params/keeper/grpc_query_test.go | 8 +-- x/staking/testutil/helpers.go | 8 +-- 21 files changed, 89 insertions(+), 139 deletions(-) diff --git a/baseapp/grpcrouter.go b/baseapp/grpcrouter.go index d311f085c0..4ce3d63e95 100644 --- a/baseapp/grpcrouter.go +++ b/baseapp/grpcrouter.go @@ -79,7 +79,7 @@ func (qrt *GRPCQueryRouter) RegisterService(sd *grpc.ServiceDesc, handler interf qrt.routes[fqName] = func(ctx sdk.Context, req abci.RequestQuery) (abci.ResponseQuery, error) { // call the method handler from the service description with the handler object, // a wrapped sdk.Context with proto-unmarshaled data from the ABCI request data - res, err := methodHandler(handler, sdk.WrapSDKContext(ctx), func(i interface{}) error { + res, err := methodHandler(handler, ctx, func(i interface{}) error { return qrt.cdc.Unmarshal(req.Data, i) }, nil) if err != nil { diff --git a/baseapp/msg_service_router.go b/baseapp/msg_service_router.go index 02192e892d..360bd89105 100644 --- a/baseapp/msg_service_router.go +++ b/baseapp/msg_service_router.go @@ -118,7 +118,7 @@ func (msr *MsgServiceRouter) RegisterService(sd *grpc.ServiceDesc, handler inter } // Call the method handler from the service description with the handler object. // We don't do any decoding here because the decoding was already done. - res, err := methodHandler(handler, sdk.WrapSDKContext(ctx), noopDecoder, interceptor) + res, err := methodHandler(handler, ctx, noopDecoder, interceptor) if err != nil { return nil, err } diff --git a/client/grpc/node/service_test.go b/client/grpc/node/service_test.go index 6204c5fa19..654b27c6f7 100644 --- a/client/grpc/node/service_test.go +++ b/client/grpc/node/service_test.go @@ -12,9 +12,8 @@ import ( func TestServiceServer_Config(t *testing.T) { svr := NewQueryServer(client.Context{}) ctx := sdk.Context{}.WithMinGasPrices(sdk.NewDecCoins(sdk.NewInt64DecCoin("stake", 15))) - goCtx := sdk.WrapSDKContext(ctx) - resp, err := svr.Config(goCtx, &ConfigRequest{}) + resp, err := svr.Config(ctx, &ConfigRequest{}) require.NoError(t, err) require.NotNil(t, resp) require.Equal(t, ctx.MinGasPrices().String(), resp.MinimumGasPrice) diff --git a/tests/integration/slashing/keeper/keeper_test.go b/tests/integration/slashing/keeper/keeper_test.go index a17a521e8f..574f1358f7 100644 --- a/tests/integration/slashing/keeper/keeper_test.go +++ b/tests/integration/slashing/keeper/keeper_test.go @@ -102,7 +102,7 @@ func (s *KeeperTestSuite) TestUnJailNotBonded() { amt := s.stakingKeeper.TokensFromConsensusPower(ctx, 50) msg := tstaking.CreateValidatorMsg(addr, val, amt) msg.MinSelfDelegation = amt - res, err := tstaking.CreateValidatorWithMsg(sdk.WrapSDKContext(ctx), msg) + res, err := tstaking.CreateValidatorWithMsg(ctx, msg) s.Require().NoError(err) s.Require().NotNil(res) diff --git a/x/auth/ante/sigverify.go b/x/auth/ante/sigverify.go index 3905613652..e95f7ca372 100644 --- a/x/auth/ante/sigverify.go +++ b/x/auth/ante/sigverify.go @@ -289,7 +289,7 @@ func (svd SigVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simul // no need to verify signatures on recheck tx if !simulate && !ctx.IsReCheckTx() { - err := authsigning.VerifySignature(sdk.WrapSDKContext(ctx), pubKey, signerData, sig.Data, svd.signModeHandler, tx) + err := authsigning.VerifySignature(ctx, pubKey, signerData, sig.Data, svd.signModeHandler, tx) if err != nil { var errMsg string if OnlyLegacyAminoSigners(sig.Data) { diff --git a/x/auth/keeper/grpc_query_test.go b/x/auth/keeper/grpc_query_test.go index 5a9ebbd2ea..1d3854b23e 100644 --- a/x/auth/keeper/grpc_query_test.go +++ b/x/auth/keeper/grpc_query_test.go @@ -57,9 +57,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryAccounts() { suite.SetupTest() // reset tc.malleate() - ctx := sdk.WrapSDKContext(suite.ctx) - - res, err := suite.queryClient.Accounts(ctx, req) + res, err := suite.queryClient.Accounts(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -139,9 +137,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryAccount() { suite.SetupTest() // reset tc.malleate() - ctx := sdk.WrapSDKContext(suite.ctx) - - res, err := suite.queryClient.Account(ctx, req) + res, err := suite.queryClient.Account(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -211,9 +207,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryAccountAddressByID() { suite.SetupTest() // reset tc.malleate() - ctx := sdk.WrapSDKContext(suite.ctx) - - res, err := suite.queryClient.AccountAddressByID(ctx, req) + res, err := suite.queryClient.AccountAddressByID(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -254,9 +248,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryParameters() { suite.SetupTest() // reset tc.malleate() - ctx := sdk.WrapSDKContext(suite.ctx) - - res, err := suite.queryClient.Params(ctx, req) + res, err := suite.queryClient.Params(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -332,9 +324,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryModuleAccounts() { suite.SetupTest() // reset tc.malleate() - ctx := sdk.WrapSDKContext(suite.ctx) - - res, err := suite.queryClient.ModuleAccounts(ctx, req) + res, err := suite.queryClient.ModuleAccounts(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -400,8 +390,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryModuleAccountByName() { suite.Run(fmt.Sprintf("Case %s", tc.msg), func() { suite.SetupTest() // reset tc.malleate() - ctx := sdk.WrapSDKContext(suite.ctx) - res, err := suite.queryClient.ModuleAccountByName(ctx, req) + res, err := suite.queryClient.ModuleAccountByName(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) suite.Require().NotNil(res) diff --git a/x/bank/keeper/grpc_query_test.go b/x/bank/keeper/grpc_query_test.go index 38b37a4fb2..63a344ea5f 100644 --- a/x/bank/keeper/grpc_query_test.go +++ b/x/bank/keeper/grpc_query_test.go @@ -92,7 +92,7 @@ func (suite *KeeperTestSuite) TestSpendableBalances() { ctx = ctx.WithBlockTime(time.Now()) queryClient := suite.mockQueryClient(ctx) - _, err := queryClient.SpendableBalances(sdk.WrapSDKContext(ctx), &types.QuerySpendableBalancesRequest{}) + _, err := queryClient.SpendableBalances(ctx, &types.QuerySpendableBalancesRequest{}) suite.Require().Error(err) pageReq := &query.PageRequest{ @@ -104,7 +104,7 @@ func (suite *KeeperTestSuite) TestSpendableBalances() { acc := authtypes.NewBaseAccountWithAddress(addr) suite.mockSpendableCoins(ctx, acc) - res, err := queryClient.SpendableBalances(sdk.WrapSDKContext(ctx), req) + res, err := queryClient.SpendableBalances(ctx, req) suite.Require().NoError(err) suite.Require().NotNil(res) suite.True(res.Balances.IsZero()) @@ -128,7 +128,7 @@ func (suite *KeeperTestSuite) TestSpendableBalances() { queryClient = suite.mockQueryClient(ctx) suite.mockSpendableCoins(ctx, vacc) - res, err = queryClient.SpendableBalances(sdk.WrapSDKContext(ctx), req) + res, err = queryClient.SpendableBalances(ctx, req) suite.Require().NoError(err) suite.Require().NotNil(res) suite.Equal(2, res.Balances.Len()) @@ -274,7 +274,7 @@ func (suite *KeeperTestSuite) QueryDenomsMetadataRequest() { suite.SetupTest() // reset tc.malleate() - ctx := sdk.WrapSDKContext(suite.ctx) + ctx := suite.ctx res, err := suite.queryClient.DenomsMetadata(ctx, req) @@ -351,7 +351,7 @@ func (suite *KeeperTestSuite) QueryDenomMetadataRequest() { suite.SetupTest() // reset tc.malleate() - ctx := sdk.WrapSDKContext(suite.ctx) + ctx := suite.ctx res, err := suite.queryClient.DenomMetadata(ctx, req) diff --git a/x/consensus/keeper/grpc_query_test.go b/x/consensus/keeper/grpc_query_test.go index cfd139afef..c6f363b6aa 100644 --- a/x/consensus/keeper/grpc_query_test.go +++ b/x/consensus/keeper/grpc_query_test.go @@ -4,7 +4,6 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/consensus/types" ) @@ -47,9 +46,7 @@ func (s *KeeperTestSuite) TestGRPCQueryConsensusParams() { s.SetupTest() // reset tc.malleate() - ctx := sdk.WrapSDKContext(s.ctx) - - res, err := s.queryClient.Params(ctx, &tc.req) + res, err := s.queryClient.Params(s.ctx, &tc.req) if tc.expPass { s.Require().NoError(err) diff --git a/x/evidence/keeper/grpc_query_test.go b/x/evidence/keeper/grpc_query_test.go index 47b3113731..ebb7fd55a8 100644 --- a/x/evidence/keeper/grpc_query_test.go +++ b/x/evidence/keeper/grpc_query_test.go @@ -3,7 +3,6 @@ package keeper_test import ( "fmt" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" "github.com/cosmos/cosmos-sdk/x/evidence/exported" "github.com/cosmos/cosmos-sdk/x/evidence/types" @@ -60,9 +59,7 @@ func (suite *KeeperTestSuite) TestQueryEvidence() { suite.SetupTest() tc.malleate() - ctx := sdk.WrapSDKContext(suite.ctx) - - res, err := suite.queryClient.Evidence(ctx, req) + res, err := suite.queryClient.Evidence(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -121,9 +118,7 @@ func (suite *KeeperTestSuite) TestQueryAllEvidence() { suite.SetupTest() tc.malleate() - ctx := sdk.WrapSDKContext(suite.ctx) - - res, err := suite.queryClient.AllEvidence(ctx, req) + res, err := suite.queryClient.AllEvidence(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) diff --git a/x/feegrant/keeper/genesis_test.go b/x/feegrant/keeper/genesis_test.go index 8db78b5f7c..9acc77f5e9 100644 --- a/x/feegrant/keeper/genesis_test.go +++ b/x/feegrant/keeper/genesis_test.go @@ -59,7 +59,7 @@ func (suite *GenesisTestSuite) TestImportExportGenesis() { genesis, err := suite.feegrantKeeper.ExportGenesis(suite.ctx) suite.Require().NoError(err) // revoke fee allowance - _, err = msgSrvr.RevokeAllowance(sdk.WrapSDKContext(suite.ctx), &feegrant.MsgRevokeAllowance{ + _, err = msgSrvr.RevokeAllowance(suite.ctx, &feegrant.MsgRevokeAllowance{ Granter: granterAddr.String(), Grantee: granteeAddr.String(), }) diff --git a/x/gov/abci_test.go b/x/gov/abci_test.go index 86860e5c46..828962c122 100644 --- a/x/gov/abci_test.go +++ b/x/gov/abci_test.go @@ -45,7 +45,7 @@ func TestTickExpiredDepositPeriod(t *testing.T) { ) require.NoError(t, err) - res, err := govMsgSvr.SubmitProposal(sdk.WrapSDKContext(ctx), newProposalMsg) + res, err := govMsgSvr.SubmitProposal(ctx, newProposalMsg) require.NoError(t, err) require.NotNil(t, res) @@ -99,7 +99,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) { ) require.NoError(t, err) - res, err := govMsgSvr.SubmitProposal(sdk.WrapSDKContext(ctx), newProposalMsg) + res, err := govMsgSvr.SubmitProposal(ctx, newProposalMsg) require.NoError(t, err) require.NotNil(t, res) @@ -123,7 +123,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) { ) require.NoError(t, err) - res, err = govMsgSvr.SubmitProposal(sdk.WrapSDKContext(ctx), newProposalMsg2) + res, err = govMsgSvr.SubmitProposal(ctx, newProposalMsg2) require.NoError(t, err) require.NotNil(t, res) @@ -182,7 +182,7 @@ func TestTickPassedDepositPeriod(t *testing.T) { ) require.NoError(t, err) - res, err := govMsgSvr.SubmitProposal(sdk.WrapSDKContext(ctx), newProposalMsg) + res, err := govMsgSvr.SubmitProposal(ctx, newProposalMsg) require.NoError(t, err) require.NotNil(t, res) @@ -202,7 +202,7 @@ func TestTickPassedDepositPeriod(t *testing.T) { newDepositMsg := v1.NewMsgDeposit(addrs[1], proposalID, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}) - res1, err := govMsgSvr.Deposit(sdk.WrapSDKContext(ctx), newDepositMsg) + res1, err := govMsgSvr.Deposit(ctx, newDepositMsg) require.NoError(t, err) require.NotNil(t, res1) @@ -235,9 +235,7 @@ func TestTickPassedVotingPeriod(t *testing.T) { newProposalMsg, err := v1.NewMsgSubmitProposal([]sdk.Msg{mkTestLegacyContent(t)}, proposalCoins, addrs[0].String(), "") require.NoError(t, err) - wrapCtx := sdk.WrapSDKContext(ctx) - - res, err := govMsgSvr.SubmitProposal(wrapCtx, newProposalMsg) + res, err := govMsgSvr.SubmitProposal(ctx, newProposalMsg) require.NoError(t, err) require.NotNil(t, res) @@ -249,7 +247,7 @@ func TestTickPassedVotingPeriod(t *testing.T) { newDepositMsg := v1.NewMsgDeposit(addrs[1], proposalID, proposalCoins) - res1, err := govMsgSvr.Deposit(wrapCtx, newDepositMsg) + res1, err := govMsgSvr.Deposit(ctx, newDepositMsg) require.NoError(t, err) require.NotNil(t, res1) @@ -307,7 +305,7 @@ func TestProposalPassedEndblocker(t *testing.T) { proposalCoins := sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, suite.StakingKeeper.TokensFromConsensusPower(ctx, 10))} newDepositMsg := v1.NewMsgDeposit(addrs[0], proposal.Id, proposalCoins) - res, err := govMsgSvr.Deposit(sdk.WrapSDKContext(ctx), newDepositMsg) + res, err := govMsgSvr.Deposit(ctx, newDepositMsg) require.NoError(t, err) require.NotNil(t, res) @@ -357,7 +355,7 @@ func TestEndBlockerProposalHandlerFailed(t *testing.T) { newDepositMsg := v1.NewMsgDeposit(addrs[0], proposal.Id, proposalCoins) govMsgSvr := keeper.NewMsgServerImpl(suite.GovKeeper) - res, err := govMsgSvr.Deposit(sdk.WrapSDKContext(ctx), newDepositMsg) + res, err := govMsgSvr.Deposit(ctx, newDepositMsg) require.NoError(t, err) require.NotNil(t, res) @@ -386,7 +384,7 @@ func createValidators(t *testing.T, stakingMsgSvr stakingtypes.MsgServer, ctx sd TestDescription, TestCommissionRates, math.OneInt(), ) require.NoError(t, err) - res, err := stakingMsgSvr.CreateValidator(sdk.WrapSDKContext(ctx), valCreateMsg) + res, err := stakingMsgSvr.CreateValidator(ctx, valCreateMsg) require.NoError(t, err) require.NotNil(t, res) } diff --git a/x/gov/keeper/msg_server_test.go b/x/gov/keeper/msg_server_test.go index db9d342da9..160e245724 100644 --- a/x/gov/keeper/msg_server_test.go +++ b/x/gov/keeper/msg_server_test.go @@ -1071,7 +1071,7 @@ func (suite *KeeperTestSuite) TestSubmitProposal_InitialDeposit() { suite.Require().NoError(err) // System under test - _, err = suite.msgSrvr.SubmitProposal(sdk.WrapSDKContext(ctx), msg) + _, err = suite.msgSrvr.SubmitProposal(ctx, msg) // Assertions if tc.expectError { diff --git a/x/group/keeper/genesis_test.go b/x/group/keeper/genesis_test.go index 557b94838e..a5f27fba96 100644 --- a/x/group/keeper/genesis_test.go +++ b/x/group/keeper/genesis_test.go @@ -66,7 +66,7 @@ func (s *GenesisTestSuite) SetupTest() { s.sdkCtx = testCtx.Ctx s.cdc = codec.NewProtoCodec(encCfg.InterfaceRegistry) - s.ctx = sdk.WrapSDKContext(s.sdkCtx) + s.ctx = s.sdkCtx s.keeper = keeper.NewKeeper(key, s.cdc, bApp.MsgServiceRouter(), accountKeeper, group.DefaultConfig()) } diff --git a/x/group/keeper/grpc_query_test.go b/x/group/keeper/grpc_query_test.go index b9b7d4461f..e71b8df51c 100644 --- a/x/group/keeper/grpc_query_test.go +++ b/x/group/keeper/grpc_query_test.go @@ -36,8 +36,6 @@ func TestQueryGroupsByMember(t *testing.T) { ctx := testCtx.Ctx - sdkCtx := sdk.WrapSDKContext(ctx) - bApp := baseapp.NewBaseApp( "group", log.NewNopLogger(), @@ -64,7 +62,7 @@ func TestQueryGroupsByMember(t *testing.T) { {Address: addrs[2].String(), Weight: "1"}, {Address: addrs[3].String(), Weight: "2"}, } - _, err := groupKeeper.CreateGroup(sdkCtx, &group.MsgCreateGroup{ + _, err := groupKeeper.CreateGroup(ctx, &group.MsgCreateGroup{ Admin: addrs[0].String(), Members: members, }) @@ -73,7 +71,7 @@ func TestQueryGroupsByMember(t *testing.T) { members = []group.MemberRequest{ {Address: addrs[3].String(), Weight: "1"}, {Address: addrs[4].String(), Weight: "2"}, } - _, err = groupKeeper.CreateGroup(sdkCtx, &group.MsgCreateGroup{ + _, err = groupKeeper.CreateGroup(ctx, &group.MsgCreateGroup{ Admin: addrs[1].String(), Members: members, }) diff --git a/x/group/keeper/keeper_test.go b/x/group/keeper/keeper_test.go index 0e9197cb27..ce271c73e4 100644 --- a/x/group/keeper/keeper_test.go +++ b/x/group/keeper/keeper_test.go @@ -479,8 +479,7 @@ func (s *TestSuite) TestUpdateGroupMetadata() { spec := spec s.Run(msg, func() { sdkCtx, _ := s.sdkCtx.CacheContext() - ctx := sdk.WrapSDKContext(sdkCtx) - _, err := s.groupKeeper.UpdateGroupMetadata(ctx, spec.req) + _, err := s.groupKeeper.UpdateGroupMetadata(sdkCtx, spec.req) if spec.expErr { s.Require().Error(err) return @@ -488,7 +487,7 @@ func (s *TestSuite) TestUpdateGroupMetadata() { s.Require().NoError(err) // then - res, err := s.groupKeeper.GroupInfo(ctx, &group.QueryGroupInfoRequest{GroupId: groupID}) + res, err := s.groupKeeper.GroupInfo(sdkCtx, &group.QueryGroupInfoRequest{GroupId: groupID}) s.Require().NoError(err) s.Assert().Equal(spec.expStored, res.Info) }) @@ -741,8 +740,7 @@ func (s *TestSuite) TestUpdateGroupMembers() { spec := spec s.Run(msg, func() { sdkCtx, _ := s.sdkCtx.CacheContext() - ctx := sdk.WrapSDKContext(sdkCtx) - _, err := s.groupKeeper.UpdateGroupMembers(ctx, spec.req) + _, err := s.groupKeeper.UpdateGroupMembers(sdkCtx, spec.req) if spec.expErr { s.Require().Error(err) return @@ -750,12 +748,12 @@ func (s *TestSuite) TestUpdateGroupMembers() { s.Require().NoError(err) // then - res, err := s.groupKeeper.GroupInfo(ctx, &group.QueryGroupInfoRequest{GroupId: groupID}) + res, err := s.groupKeeper.GroupInfo(sdkCtx, &group.QueryGroupInfoRequest{GroupId: groupID}) s.Require().NoError(err) s.Assert().Equal(spec.expGroup, res.Info) // and members persisted - membersRes, err := s.groupKeeper.GroupMembers(ctx, &group.QueryGroupMembersRequest{GroupId: groupID}) + membersRes, err := s.groupKeeper.GroupMembers(sdkCtx, &group.QueryGroupMembersRequest{GroupId: groupID}) s.Require().NoError(err) loadedMembers := membersRes.Members s.Require().Equal(len(spec.expMembers), len(loadedMembers)) @@ -2228,12 +2226,10 @@ func (s *TestSuite) TestVote() { sdkCtx = spec.srcCtx } sdkCtx, _ = sdkCtx.CacheContext() - ctx := sdk.WrapSDKContext(sdkCtx) - if spec.doBefore != nil { - spec.doBefore(ctx) + spec.doBefore(sdkCtx) } - _, err := s.groupKeeper.Vote(ctx, spec.req) + _, err := s.groupKeeper.Vote(sdkCtx, spec.req) if spec.expErr { s.Require().Error(err) return @@ -2242,7 +2238,7 @@ func (s *TestSuite) TestVote() { if !(spec.expExecutorResult == group.PROPOSAL_EXECUTOR_RESULT_SUCCESS) { // vote is stored and all data persisted - res, err := s.groupKeeper.VoteByProposalVoter(ctx, &group.QueryVoteByProposalVoterRequest{ + res, err := s.groupKeeper.VoteByProposalVoter(sdkCtx, &group.QueryVoteByProposalVoterRequest{ ProposalId: spec.req.ProposalId, Voter: spec.req.Voter, }) @@ -2255,7 +2251,7 @@ func (s *TestSuite) TestVote() { s.Assert().Equal(s.blockTime, loaded.SubmitTime) // query votes by proposal - votesByProposalRes, err := s.groupKeeper.VotesByProposal(ctx, &group.QueryVotesByProposalRequest{ + votesByProposalRes, err := s.groupKeeper.VotesByProposal(sdkCtx, &group.QueryVotesByProposalRequest{ ProposalId: spec.req.ProposalId, }) s.Require().NoError(err) @@ -2270,7 +2266,7 @@ func (s *TestSuite) TestVote() { // query votes by voter voter := spec.req.Voter - votesByVoterRes, err := s.groupKeeper.VotesByVoter(ctx, &group.QueryVotesByVoterRequest{ + votesByVoterRes, err := s.groupKeeper.VotesByVoter(sdkCtx, &group.QueryVotesByVoterRequest{ Voter: voter, }) s.Require().NoError(err) @@ -2282,7 +2278,7 @@ func (s *TestSuite) TestVote() { s.Assert().Equal(spec.req.Metadata, votesByVoter[0].Metadata) s.Assert().Equal(s.blockTime, votesByVoter[0].SubmitTime) - proposalRes, err := s.groupKeeper.Proposal(ctx, &group.QueryProposalRequest{ + proposalRes, err := s.groupKeeper.Proposal(sdkCtx, &group.QueryProposalRequest{ ProposalId: spec.req.ProposalId, }) s.Require().NoError(err) @@ -2493,9 +2489,7 @@ func (s *TestSuite) TestExecProposal() { // Wait after min execution period end before Exec sdkCtx := sdk.UnwrapSDKContext(ctx) sdkCtx = sdkCtx.WithBlockTime(sdkCtx.BlockTime().Add(minExecutionPeriod)) // MinExecutionPeriod is 5s - ctx = sdk.WrapSDKContext(sdkCtx) - - _, err := s.groupKeeper.Exec(ctx, &group.MsgExec{Executor: addr1.String(), ProposalId: myProposalID}) + _, err := s.groupKeeper.Exec(sdkCtx, &group.MsgExec{Executor: addr1.String(), ProposalId: myProposalID}) s.Require().NoError(err) return myProposalID }, @@ -2527,10 +2521,8 @@ func (s *TestSuite) TestExecProposal() { // Wait after min execution period end before Exec sdkCtx := sdk.UnwrapSDKContext(ctx) sdkCtx = sdkCtx.WithBlockTime(sdkCtx.BlockTime().Add(minExecutionPeriod)) // MinExecutionPeriod is 5s - ctx = sdk.WrapSDKContext(sdkCtx) - s.bankKeeper.EXPECT().Send(gomock.Any(), msgSend2).Return(nil, fmt.Errorf("error")) - _, err := s.groupKeeper.Exec(ctx, &group.MsgExec{Executor: addr1.String(), ProposalId: myProposalID}) + _, err := s.groupKeeper.Exec(sdkCtx, &group.MsgExec{Executor: addr1.String(), ProposalId: myProposalID}) s.bankKeeper.EXPECT().Send(gomock.Any(), msgSend2).Return(nil, nil) s.Require().NoError(err) @@ -2547,15 +2539,13 @@ func (s *TestSuite) TestExecProposal() { spec := spec s.Run(msg, func() { sdkCtx, _ := s.sdkCtx.CacheContext() - ctx := sdk.WrapSDKContext(sdkCtx) - proposalID := spec.setupProposal(ctx) + proposalID := spec.setupProposal(sdkCtx) if !spec.srcBlockTime.IsZero() { sdkCtx = sdkCtx.WithBlockTime(spec.srcBlockTime) } - ctx = sdk.WrapSDKContext(sdkCtx) - _, err := s.groupKeeper.Exec(ctx, &group.MsgExec{Executor: addr1.String(), ProposalId: proposalID}) + _, err := s.groupKeeper.Exec(sdkCtx, &group.MsgExec{Executor: addr1.String(), ProposalId: proposalID}) if spec.expErr { s.Require().Error(err) return @@ -2565,7 +2555,7 @@ func (s *TestSuite) TestExecProposal() { if !(spec.expExecutorResult == group.PROPOSAL_EXECUTOR_RESULT_SUCCESS) { // and proposal is updated - res, err := s.groupKeeper.Proposal(ctx, &group.QueryProposalRequest{ProposalId: proposalID}) + res, err := s.groupKeeper.Proposal(sdkCtx, &group.QueryProposalRequest{ProposalId: proposalID}) s.Require().NoError(err) proposal := res.Proposal @@ -2733,9 +2723,7 @@ func (s *TestSuite) TestExecPrunedProposalsAndVotes() { // Wait for min execution period end sdkCtx := sdk.UnwrapSDKContext(ctx) sdkCtx = sdkCtx.WithBlockTime(sdkCtx.BlockTime().Add(minExecutionPeriod)) - ctx = sdk.WrapSDKContext(sdkCtx) - - _, err := s.groupKeeper.Exec(ctx, &group.MsgExec{Executor: addr1.String(), ProposalId: myProposalID}) + _, err := s.groupKeeper.Exec(sdkCtx, &group.MsgExec{Executor: addr1.String(), ProposalId: myProposalID}) s.bankKeeper.EXPECT().Send(gomock.Any(), msgSend2).Return(nil, nil) s.Require().NoError(err) @@ -2749,8 +2737,7 @@ func (s *TestSuite) TestExecPrunedProposalsAndVotes() { spec := spec s.Run(msg, func() { sdkCtx, _ := s.sdkCtx.CacheContext() - ctx := sdk.WrapSDKContext(sdkCtx) - proposalID := spec.setupProposal(ctx) + proposalID := spec.setupProposal(sdkCtx) if !spec.srcBlockTime.IsZero() { sdkCtx = sdkCtx.WithBlockTime(spec.srcBlockTime) @@ -2758,8 +2745,7 @@ func (s *TestSuite) TestExecPrunedProposalsAndVotes() { // Wait for min execution period end sdkCtx = sdkCtx.WithBlockTime(sdkCtx.BlockTime().Add(minExecutionPeriod)) - ctx = sdk.WrapSDKContext(sdkCtx) - _, err := s.groupKeeper.Exec(ctx, &group.MsgExec{Executor: addr1.String(), ProposalId: proposalID}) + _, err := s.groupKeeper.Exec(sdkCtx, &group.MsgExec{Executor: addr1.String(), ProposalId: proposalID}) if spec.expErr { s.Require().Error(err) s.Require().Contains(err.Error(), spec.expErrMsg) @@ -2769,17 +2755,17 @@ func (s *TestSuite) TestExecPrunedProposalsAndVotes() { if spec.expExecutorResult == group.PROPOSAL_EXECUTOR_RESULT_SUCCESS { // Make sure proposal is deleted from state - _, err := s.groupKeeper.Proposal(ctx, &group.QueryProposalRequest{ProposalId: proposalID}) + _, err := s.groupKeeper.Proposal(sdkCtx, &group.QueryProposalRequest{ProposalId: proposalID}) s.Require().Contains(err.Error(), spec.expErrMsg) - res, err := s.groupKeeper.VotesByProposal(ctx, &group.QueryVotesByProposalRequest{ProposalId: proposalID}) + res, err := s.groupKeeper.VotesByProposal(sdkCtx, &group.QueryVotesByProposalRequest{ProposalId: proposalID}) s.Require().NoError(err) s.Require().Empty(res.GetVotes()) } else { // Check that proposal and votes exists - res, err := s.groupKeeper.Proposal(ctx, &group.QueryProposalRequest{ProposalId: proposalID}) + res, err := s.groupKeeper.Proposal(sdkCtx, &group.QueryProposalRequest{ProposalId: proposalID}) s.Require().NoError(err) - _, err = s.groupKeeper.VotesByProposal(ctx, &group.QueryVotesByProposalRequest{ProposalId: res.Proposal.Id}) + _, err = s.groupKeeper.VotesByProposal(sdkCtx, &group.QueryVotesByProposalRequest{ProposalId: res.Proposal.Id}) s.Require().NoError(err) s.Require().Equal("", spec.expErrMsg) diff --git a/x/group/keeper/msg_server.go b/x/group/keeper/msg_server.go index 70486a0962..e1e734d43f 100644 --- a/x/group/keeper/msg_server.go +++ b/x/group/keeper/msg_server.go @@ -537,7 +537,7 @@ func (k Keeper) SubmitProposal(goCtx context.Context, req *group.MsgSubmitPropos // Consider proposers as Yes votes for i := range proposers { ctx.GasMeter().ConsumeGas(gasCostPerIteration, "vote on proposal") - _, err = k.Vote(sdk.WrapSDKContext(ctx), &group.MsgVote{ + _, err = k.Vote(ctx, &group.MsgVote{ ProposalId: id, Voter: proposers[i], Option: group.VOTE_OPTION_YES, @@ -548,7 +548,7 @@ func (k Keeper) SubmitProposal(goCtx context.Context, req *group.MsgSubmitPropos } // Then try to execute the proposal - _, err = k.Exec(sdk.WrapSDKContext(ctx), &group.MsgExec{ + _, err = k.Exec(ctx, &group.MsgExec{ ProposalId: id, // We consider the first proposer as the MsgExecRequest signer // but that could be revisited (eg using the group policy) @@ -659,7 +659,7 @@ func (k Keeper) Vote(goCtx context.Context, req *group.MsgVote) (*group.MsgVoteR // Try to execute proposal immediately if req.Exec == group.Exec_EXEC_TRY { - _, err = k.Exec(sdk.WrapSDKContext(ctx), &group.MsgExec{ + _, err = k.Exec(ctx, &group.MsgExec{ ProposalId: id, Executor: voterAddr, }) diff --git a/x/group/keeper/tally_test.go b/x/group/keeper/tally_test.go index ac4d182631..8b9b7940f4 100644 --- a/x/group/keeper/tally_test.go +++ b/x/group/keeper/tally_test.go @@ -71,14 +71,12 @@ func (s *TestSuite) TestTally() { spec := spec s.Run(msg, func() { sdkCtx, _ := s.sdkCtx.CacheContext() - ctx := sdk.WrapSDKContext(sdkCtx) - - pId := spec.setupProposal(ctx) + pId := spec.setupProposal(sdkCtx) req := &group.QueryTallyResultRequest{ ProposalId: pId, } - res, err := s.groupKeeper.TallyResult(ctx, req) + res, err := s.groupKeeper.TallyResult(sdkCtx, req) if spec.expErr { s.Require().Error(err) } else { diff --git a/x/group/simulation/operations.go b/x/group/simulation/operations.go index d210ff5089..5c4eccffec 100644 --- a/x/group/simulation/operations.go +++ b/x/group/simulation/operations.go @@ -437,8 +437,7 @@ func SimulateMsgSubmitProposal(cdc *codec.ProtoCodec, ak group.AccountKeeper, bk } // Pick a random member from the group - ctx := sdk.WrapSDKContext(sdkCtx) - acc, account, err := randomMember(ctx, r, k, ak, accounts, groupID) + acc, account, err := randomMember(sdkCtx, r, k, ak, accounts, groupID) if err != nil { return simtypes.NoOpMsg(group.ModuleName, TypeMsgSubmitProposal, ""), nil, err } @@ -867,8 +866,6 @@ func SimulateMsgWithdrawProposal(cdc *codec.ProtoCodec, ak group.AccountKeeper, } groupPolicyAddr := groupPolicy.Address - ctx := sdk.WrapSDKContext(sdkCtx) - policy, err := groupPolicy.GetDecisionPolicy() if err != nil { return simtypes.NoOpMsg(group.ModuleName, TypeMsgWithdrawProposal, err.Error()), nil, nil @@ -878,7 +875,7 @@ func SimulateMsgWithdrawProposal(cdc *codec.ProtoCodec, ak group.AccountKeeper, return simtypes.NoOpMsg(group.ModuleName, TypeMsgWithdrawProposal, err.Error()), nil, nil } - proposalsResult, err := k.ProposalsByGroupPolicy(ctx, &group.QueryProposalsByGroupPolicyRequest{Address: groupPolicyAddr}) + proposalsResult, err := k.ProposalsByGroupPolicy(sdkCtx, &group.QueryProposalsByGroupPolicyRequest{Address: groupPolicyAddr}) if err != nil { return simtypes.NoOpMsg(group.ModuleName, TypeMsgWithdrawProposal, "fail to query group info"), nil, err } @@ -975,8 +972,7 @@ func SimulateMsgVote(cdc *codec.ProtoCodec, ak group.AccountKeeper, groupPolicyAddr := groupPolicy.Address // Pick a random member from the group - ctx := sdk.WrapSDKContext(sdkCtx) - acc, account, err := randomMember(ctx, r, k, ak, accounts, g.Id) + acc, account, err := randomMember(sdkCtx, r, k, ak, accounts, g.Id) if err != nil { return simtypes.NoOpMsg(group.ModuleName, TypeMsgVote, ""), nil, err } @@ -990,7 +986,7 @@ func SimulateMsgVote(cdc *codec.ProtoCodec, ak group.AccountKeeper, return simtypes.NoOpMsg(group.ModuleName, TypeMsgVote, "fee error"), nil, err } - proposalsResult, err := k.ProposalsByGroupPolicy(ctx, &group.QueryProposalsByGroupPolicyRequest{Address: groupPolicyAddr}) + proposalsResult, err := k.ProposalsByGroupPolicy(sdkCtx, &group.QueryProposalsByGroupPolicyRequest{Address: groupPolicyAddr}) if err != nil { return simtypes.NoOpMsg(group.ModuleName, TypeMsgVote, "fail to query group info"), nil, err } @@ -1018,7 +1014,7 @@ func SimulateMsgVote(cdc *codec.ProtoCodec, ak group.AccountKeeper, } // Ensure member hasn't already voted - res, _ := k.VoteByProposalVoter(ctx, &group.QueryVoteByProposalVoterRequest{ + res, _ := k.VoteByProposalVoter(sdkCtx, &group.QueryVoteByProposalVoterRequest{ Voter: acc.Address.String(), ProposalId: uint64(proposalID), }) @@ -1083,8 +1079,7 @@ func SimulateMsgExec(cdc *codec.ProtoCodec, ak group.AccountKeeper, return simtypes.NoOpMsg(TypeMsgExec, TypeMsgExec, "fee error"), nil, err } - ctx := sdk.WrapSDKContext(sdkCtx) - proposalsResult, err := k.ProposalsByGroupPolicy(ctx, &group.QueryProposalsByGroupPolicyRequest{Address: groupPolicyAddr}) + proposalsResult, err := k.ProposalsByGroupPolicy(sdkCtx, &group.QueryProposalsByGroupPolicyRequest{Address: groupPolicyAddr}) if err != nil { return simtypes.NoOpMsg(TypeMsgExec, TypeMsgExec, "fail to query group info"), nil, err } @@ -1144,7 +1139,6 @@ func SimulateMsgLeaveGroup(cdc *codec.ProtoCodec, k keeper.Keeper, ak group.Acco return func( r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { - ctx := sdk.WrapSDKContext(sdkCtx) groupInfo, policyInfo, _, _, err := randomGroupPolicy(r, k, ak, sdkCtx, accounts) if err != nil { return simtypes.NoOpMsg(group.ModuleName, TypeMsgLeaveGroup, ""), nil, err @@ -1155,7 +1149,7 @@ func SimulateMsgLeaveGroup(cdc *codec.ProtoCodec, k keeper.Keeper, ak group.Acco } // Pick a random member from the group - acc, account, err := randomMember(ctx, r, k, ak, accounts, groupInfo.Id) + acc, account, err := randomMember(sdkCtx, r, k, ak, accounts, groupInfo.Id) if err != nil { return simtypes.NoOpMsg(group.ModuleName, TypeMsgLeaveGroup, ""), nil, err } @@ -1215,7 +1209,7 @@ func randomGroup(r *rand.Rand, k keeper.Keeper, ak group.AccountKeeper, initialGroupID = groupID } - res, err := k.GroupInfo(sdk.WrapSDKContext(ctx), &group.QueryGroupInfoRequest{GroupId: groupID}) + res, err := k.GroupInfo(ctx, &group.QueryGroupInfoRequest{GroupId: groupID}) if err != nil { return nil, simtypes.Account{}, nil, err } @@ -1249,7 +1243,7 @@ func randomGroupPolicy(r *rand.Rand, k keeper.Keeper, ak group.AccountKeeper, } groupID := groupInfo.Id - result, err := k.GroupPoliciesByGroup(sdk.WrapSDKContext(ctx), &group.QueryGroupPoliciesByGroupRequest{GroupId: groupID}) + result, err := k.GroupPoliciesByGroup(ctx, &group.QueryGroupPoliciesByGroupRequest{GroupId: groupID}) if err != nil { return groupInfo, nil, simtypes.Account{}, nil, err } diff --git a/x/group/simulation/operations_test.go b/x/group/simulation/operations_test.go index ac6aa62de6..ded0b57195 100644 --- a/x/group/simulation/operations_test.go +++ b/x/group/simulation/operations_test.go @@ -182,7 +182,7 @@ func (suite *SimTestSuite) TestSimulateCreateGroupPolicy() { acc := accounts[0] // setup a group - _, err := suite.groupKeeper.CreateGroup(sdk.WrapSDKContext(suite.ctx), + _, err := suite.groupKeeper.CreateGroup(suite.ctx, &group.MsgCreateGroup{ Admin: acc.Address.String(), Members: []group.MemberRequest{ @@ -224,7 +224,7 @@ func (suite *SimTestSuite) TestSimulateSubmitProposal() { acc := accounts[0] // setup a group - ctx := sdk.WrapSDKContext(suite.ctx) + ctx := suite.ctx groupRes, err := suite.groupKeeper.CreateGroup(ctx, &group.MsgCreateGroup{ Admin: acc.Address.String(), @@ -277,7 +277,7 @@ func (suite *SimTestSuite) TestWithdrawProposal() { acc := accounts[0] // setup a group - ctx := sdk.WrapSDKContext(suite.ctx) + ctx := suite.ctx addr := acc.Address.String() groupRes, err := suite.groupKeeper.CreateGroup(ctx, &group.MsgCreateGroup{ @@ -343,7 +343,7 @@ func (suite *SimTestSuite) TestSimulateVote() { acc := accounts[0] // setup a group - ctx := sdk.WrapSDKContext(suite.ctx) + ctx := suite.ctx addr := acc.Address.String() groupRes, err := suite.groupKeeper.CreateGroup(ctx, &group.MsgCreateGroup{ @@ -410,7 +410,7 @@ func (suite *SimTestSuite) TestSimulateExec() { acc := accounts[0] // setup a group - ctx := sdk.WrapSDKContext(suite.ctx) + ctx := suite.ctx addr := acc.Address.String() groupRes, err := suite.groupKeeper.CreateGroup(ctx, &group.MsgCreateGroup{ @@ -485,7 +485,7 @@ func (suite *SimTestSuite) TestSimulateUpdateGroupAdmin() { acc := accounts[0] // setup a group - _, err := suite.groupKeeper.CreateGroup(sdk.WrapSDKContext(suite.ctx), + _, err := suite.groupKeeper.CreateGroup(suite.ctx, &group.MsgCreateGroup{ Admin: acc.Address.String(), Members: []group.MemberRequest{ @@ -527,7 +527,7 @@ func (suite *SimTestSuite) TestSimulateUpdateGroupMetadata() { acc := accounts[0] // setup a group - _, err := suite.groupKeeper.CreateGroup(sdk.WrapSDKContext(suite.ctx), + _, err := suite.groupKeeper.CreateGroup(suite.ctx, &group.MsgCreateGroup{ Admin: acc.Address.String(), Members: []group.MemberRequest{ @@ -569,7 +569,7 @@ func (suite *SimTestSuite) TestSimulateUpdateGroupMembers() { acc := accounts[0] // setup a group - _, err := suite.groupKeeper.CreateGroup(sdk.WrapSDKContext(suite.ctx), + _, err := suite.groupKeeper.CreateGroup(suite.ctx, &group.MsgCreateGroup{ Admin: acc.Address.String(), Members: []group.MemberRequest{ @@ -611,7 +611,7 @@ func (suite *SimTestSuite) TestSimulateUpdateGroupPolicyAdmin() { acc := accounts[0] // setup a group - ctx := sdk.WrapSDKContext(suite.ctx) + ctx := suite.ctx groupRes, err := suite.groupKeeper.CreateGroup(ctx, &group.MsgCreateGroup{ Admin: acc.Address.String(), @@ -664,7 +664,7 @@ func (suite *SimTestSuite) TestSimulateUpdateGroupPolicyDecisionPolicy() { acc := accounts[0] // setup a group - ctx := sdk.WrapSDKContext(suite.ctx) + ctx := suite.ctx groupRes, err := suite.groupKeeper.CreateGroup(ctx, &group.MsgCreateGroup{ Admin: acc.Address.String(), @@ -717,7 +717,7 @@ func (suite *SimTestSuite) TestSimulateUpdateGroupPolicyMetadata() { acc := accounts[0] // setup a group - ctx := sdk.WrapSDKContext(suite.ctx) + ctx := suite.ctx groupRes, err := suite.groupKeeper.CreateGroup(ctx, &group.MsgCreateGroup{ Admin: acc.Address.String(), @@ -775,7 +775,7 @@ func (suite *SimTestSuite) TestSimulateLeaveGroup() { member3 := accounts[3] // setup a group - ctx := sdk.WrapSDKContext(suite.ctx) + ctx := suite.ctx groupRes, err := suite.groupKeeper.CreateGroup(ctx, &group.MsgCreateGroup{ Admin: admin.Address.String(), diff --git a/x/params/keeper/grpc_query_test.go b/x/params/keeper/grpc_query_test.go index ff3f5a5959..abe252c191 100644 --- a/x/params/keeper/grpc_query_test.go +++ b/x/params/keeper/grpc_query_test.go @@ -3,7 +3,6 @@ package keeper_test import ( "fmt" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" ) @@ -65,13 +64,12 @@ func (suite *KeeperTestSuite) TestGRPCQueryParams() { } suite.SetupTest() - ctx := sdk.WrapSDKContext(suite.ctx) for _, tc := range testCases { suite.Run(fmt.Sprintf("Case %s", tc.msg), func() { tc.malleate() - res, err := suite.queryClient.Params(ctx, req) + res, err := suite.queryClient.Params(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -86,11 +84,9 @@ func (suite *KeeperTestSuite) TestGRPCQueryParams() { } func (suite *KeeperTestSuite) TestGRPCQuerySubspaces() { - ctx := sdk.WrapSDKContext(suite.ctx) - // NOTE: Each subspace will not have any keys that we can check against // because InitGenesis has not been called during app construction. - resp, err := suite.queryClient.Subspaces(ctx, &proposal.QuerySubspacesRequest{}) + resp, err := suite.queryClient.Subspaces(suite.ctx, &proposal.QuerySubspacesRequest{}) suite.Require().NoError(err) suite.Require().NotNil(resp) diff --git a/x/staking/testutil/helpers.go b/x/staking/testutil/helpers.go index 7aeb9934b6..3dae28b09a 100644 --- a/x/staking/testutil/helpers.go +++ b/x/staking/testutil/helpers.go @@ -64,7 +64,7 @@ func (sh *Helper) CreateValidatorWithMsg(ctx context.Context, msg *stakingtypes. func (sh *Helper) createValidator(addr sdk.ValAddress, pk cryptotypes.PubKey, coin sdk.Coin, ok bool) { msg, err := stakingtypes.NewMsgCreateValidator(addr, pk, coin, stakingtypes.Description{}, sh.Commission, math.OneInt()) require.NoError(sh.t, err) - res, err := sh.msgSrvr.CreateValidator(sdk.WrapSDKContext(sh.Ctx), msg) + res, err := sh.msgSrvr.CreateValidator(sh.Ctx, msg) if ok { require.NoError(sh.t, err) require.NotNil(sh.t, res) @@ -78,7 +78,7 @@ func (sh *Helper) createValidator(addr sdk.ValAddress, pk cryptotypes.PubKey, co func (sh *Helper) Delegate(delegator sdk.AccAddress, val sdk.ValAddress, amount math.Int) { coin := sdk.NewCoin(sh.Denom, amount) msg := stakingtypes.NewMsgDelegate(delegator, val, coin) - res, err := sh.msgSrvr.Delegate(sdk.WrapSDKContext(sh.Ctx), msg) + res, err := sh.msgSrvr.Delegate(sh.Ctx, msg) require.NoError(sh.t, err) require.NotNil(sh.t, res) } @@ -87,7 +87,7 @@ func (sh *Helper) Delegate(delegator sdk.AccAddress, val sdk.ValAddress, amount func (sh *Helper) DelegateWithPower(delegator sdk.AccAddress, val sdk.ValAddress, power int64) { coin := sdk.NewCoin(sh.Denom, sh.k.TokensFromConsensusPower(sh.Ctx, power)) msg := stakingtypes.NewMsgDelegate(delegator, val, coin) - res, err := sh.msgSrvr.Delegate(sdk.WrapSDKContext(sh.Ctx), msg) + res, err := sh.msgSrvr.Delegate(sh.Ctx, msg) require.NoError(sh.t, err) require.NotNil(sh.t, res) } @@ -96,7 +96,7 @@ func (sh *Helper) DelegateWithPower(delegator sdk.AccAddress, val sdk.ValAddress func (sh *Helper) Undelegate(delegator sdk.AccAddress, val sdk.ValAddress, amount math.Int, ok bool) { unbondAmt := sdk.NewCoin(sh.Denom, amount) msg := stakingtypes.NewMsgUndelegate(delegator, val, unbondAmt) - res, err := sh.msgSrvr.Undelegate(sdk.WrapSDKContext(sh.Ctx), msg) + res, err := sh.msgSrvr.Undelegate(sh.Ctx, msg) if ok { require.NoError(sh.t, err) require.NotNil(sh.t, res)