chore: clean-up deprecated function usage (cosmos#14078)

dolnetmedia · Nov 30, 2022 · 6239cdf · 6239cdf
1 parent 2e3d38f
commit 6239cdf
Show file tree

Hide file tree

Showing 21 changed files with 89 additions and 139 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,
 	})