Use page request

x/distribution/client/cli/query.go

@@ -191,9 +191,16 @@ $ %s query distribution slashes cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ldmq
 				return fmt.Errorf("end-height %s not a valid uint, please input a valid end-height", args[2])
 			}
 
+			pageReq := client.ReadPageRequest(cmd.Flags())
+
 			res, err := queryClient.ValidatorSlashes(
 				context.Background(),
-				&types.QueryValidatorSlashesRequest{ValidatorAddress: validatorAddr, StartingHeight: startHeight, EndingHeight: endHeight},
+				&types.QueryValidatorSlashesRequest{
+					ValidatorAddress: validatorAddr,
+					StartingHeight:   startHeight,
+					EndingHeight:     endHeight,
+					Req:              pageReq,
+				},
 			)
 			if err != nil {
 				return err
@@ -204,6 +211,7 @@ $ %s query distribution slashes cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ldmq
 	}
 
 	flags.AddQueryFlagsToCmd(cmd)
+	flags.AddPaginationFlagsToCmd(cmd, "validator slashes")
 	return cmd
 }
 

x/gov/client/cli/query.go

@@ -11,7 +11,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/query"
 	"github.com/cosmos/cosmos-sdk/version"
 	gcutils "github.com/cosmos/cosmos-sdk/x/gov/client/utils"
 	"github.com/cosmos/cosmos-sdk/x/gov/types"
@@ -137,13 +136,15 @@ $ %s query gov proposals --page=2 --limit=100
 			}
 			queryClient := types.NewQueryClient(clientCtx)
 
+			pageReq := client.ReadPageRequest(cmd.Flags())
+
 			res, err := queryClient.Proposals(
 				context.Background(),
 				&types.QueryProposalsRequest{
 					ProposalStatus: proposalStatus,
 					Voter:          voterAddr,
 					Depositor:      depositorAddr,
-					Req:            &query.PageRequest{},
+					Req:            pageReq,
 				},
 			)
 			if err != nil {
@@ -161,6 +162,7 @@ $ %s query gov proposals --page=2 --limit=100
 	cmd.Flags().String(flagDepositor, "", "(optional) filter by proposals deposited on by depositor")
 	cmd.Flags().String(flagVoter, "", "(optional) filter by proposals voted on by voted")
 	cmd.Flags().String(flagStatus, "", "(optional) filter proposals by proposal status, status: deposit_period/voting_period/passed/rejected")
+	flags.AddPaginationFlagsToCmd(cmd, "proposals")
 	flags.AddQueryFlagsToCmd(cmd)
 
 	return cmd
@@ -297,9 +299,11 @@ $ %[1]s query gov votes 1 --page=2 --limit=100
 
 			}
 
+			pageReq := client.ReadPageRequest(cmd.Flags())
+
 			res, err := queryClient.Votes(
 				context.Background(),
-				&types.QueryVotesRequest{ProposalId: proposalID, Req: &query.PageRequest{}},
+				&types.QueryVotesRequest{ProposalId: proposalID, Req: pageReq},
 			)
 			if err != nil {
 				return err
@@ -310,6 +314,10 @@ $ %[1]s query gov votes 1 --page=2 --limit=100
 		},
 	}
 
+	// Deprecated, remove line when removing FlagPage altogether.
+	cmd.Flags().Int(flags.FlagPage, 1, "pagination page of proposals to to query for")
+
+	flags.AddPaginationFlagsToCmd(cmd, "votes")
 	flags.AddQueryFlagsToCmd(cmd)
 
 	return cmd
@@ -438,9 +446,11 @@ $ %s query gov deposits 1
 				return clientCtx.PrintOutput(dep)
 			}
 
+			pageReq := client.ReadPageRequest(cmd.Flags())
+
 			res, err := queryClient.Deposits(
 				context.Background(),
-				&types.QueryDepositsRequest{ProposalId: proposalID, Req: &query.PageRequest{}},
+				&types.QueryDepositsRequest{ProposalId: proposalID, Req: pageReq},
 			)
 			if err != nil {
 				return err
@@ -450,6 +460,7 @@ $ %s query gov deposits 1
 		},
 	}
 
+	flags.AddPaginationFlagsToCmd(cmd, "deposits")
 	flags.AddQueryFlagsToCmd(cmd)
 
 	return cmd
@@ -533,28 +544,38 @@ $ %s query gov params
 			if err != nil {
 				return err
 			}
+			queryClient := types.NewQueryClient(clientCtx)
 
-			tp, _, err := clientCtx.QueryWithData(fmt.Sprintf("custom/%s/params/tallying", types.QuerierRoute), nil)
+			// Query store for all 3 params
+			votingRes, err := queryClient.Params(
+				context.Background(),
+				&types.QueryParamsRequest{ParamsType: "voting"},
+			)
 			if err != nil {
 				return err
 			}
-			dp, _, err := clientCtx.QueryWithData(fmt.Sprintf("custom/%s/params/deposit", types.QuerierRoute), nil)
+
+			tallyRes, err := queryClient.Params(
+				context.Background(),
+				&types.QueryParamsRequest{ParamsType: "tallying"},
+			)
 			if err != nil {
 				return err
 			}
-			vp, _, err := clientCtx.QueryWithData(fmt.Sprintf("custom/%s/params/voting", types.QuerierRoute), nil)
+
+			depositRes, err := queryClient.Params(
+				context.Background(),
+				&types.QueryParamsRequest{ParamsType: "deposit"},
+			)
 			if err != nil {
 				return err
 			}
 
-			var tallyParams types.TallyParams
-			clientCtx.JSONMarshaler.MustUnmarshalJSON(tp, &tallyParams)
-			var depositParams types.DepositParams
-			clientCtx.JSONMarshaler.MustUnmarshalJSON(dp, &depositParams)
-			var votingParams types.VotingParams
-			clientCtx.JSONMarshaler.MustUnmarshalJSON(vp, &votingParams)
-
-			return clientCtx.PrintOutput(types.NewParams(votingParams, tallyParams, depositParams))
+			return clientCtx.PrintOutput(types.NewParams(
+				votingRes.GetVotingParams(),
+				tallyRes.GetTallyParams(),
+				depositRes.GetDepositParams(),
+			))
 		},
 	}
 

x/upgrade/client/cli/query.go

@@ -41,8 +41,8 @@ func GetCurrentPlanCmd() *cobra.Command {
 			}
 			queryClient := types.NewQueryClient(clientCtx)
 
-			params := types.NewQueryCurrentPlanRequest()
-			res, err := queryClient.CurrentPlan(context.Background(), params)
+			params := types.QueryCurrentPlanRequest{}
+			res, err := queryClient.CurrentPlan(context.Background(), &params)
 			if err != nil {
 				return err
 			}
@@ -77,9 +77,8 @@ func GetAppliedPlanCmd() *cobra.Command {
 			}
 			queryClient := types.NewQueryClient(clientCtx)
 
-			name := args[0]
-			params := types.NewQueryAppliedPlanRequest(name)
-			res, err := queryClient.AppliedPlan(context.Background(), params)
+			params := types.QueryAppliedPlanRequest{Name: args[0]}
+			res, err := queryClient.AppliedPlan(context.Background(), &params)
 			if err != nil {
 				return err
 			}

x/upgrade/client/rest/query.go

@@ -45,7 +45,7 @@ func getDonePlanHandler(clientCtx client.Context) func(http.ResponseWriter, *htt
 	return func(w http.ResponseWriter, r *http.Request) {
 		name := mux.Vars(r)["name"]
 
-		params := types.NewQueryAppliedPlanRequest(name)
+		params := types.QueryAppliedPlanRequest{Name: name}
 		bz, err := clientCtx.JSONMarshaler.MarshalJSON(params)
 		if rest.CheckBadRequestError(w, err) {
 			return

x/upgrade/keeper/grpc_query_test.go

@@ -46,7 +46,7 @@ func (suite *UpgradeTestSuite) TestQueryCurrentPlan() {
 		{
 			"without current upgrade plan",
 			func() {
-				req = types.NewQueryCurrentPlanRequest()
+				req = &types.QueryCurrentPlanRequest{}
 				expResponse = types.QueryCurrentPlanResponse{}
 			},
 			true,
@@ -57,7 +57,7 @@ func (suite *UpgradeTestSuite) TestQueryCurrentPlan() {
 				plan := types.Plan{Name: "test-plan", Height: 5}
 				suite.app.UpgradeKeeper.ScheduleUpgrade(suite.ctx, plan)
 
-				req = types.NewQueryCurrentPlanRequest()
+				req = &types.QueryCurrentPlanRequest{}
 				expResponse = types.QueryCurrentPlanResponse{Plan: &plan}
 			},
 			true,
@@ -97,7 +97,7 @@ func (suite *UpgradeTestSuite) TestAppliedCurrentPlan() {
 		{
 			"with non-existent upgrade plan",
 			func() {
-				req = types.NewQueryAppliedPlanRequest("foo")
+				req = &types.QueryAppliedPlanRequest{Name: "foo"}
 			},
 			true,
 		},
@@ -114,7 +114,7 @@ func (suite *UpgradeTestSuite) TestAppliedCurrentPlan() {
 				suite.app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx sdk.Context, plan types.Plan) {})
 				suite.app.UpgradeKeeper.ApplyUpgrade(suite.ctx, plan)
 
-				req = types.NewQueryAppliedPlanRequest(planName)
+				req = &types.QueryAppliedPlanRequest{Name: planName}
 			},
 			true,
 		},

x/upgrade/types/querier.go

@@ -5,13 +5,3 @@ const (
 	QueryCurrent = "current"
 	QueryApplied = "applied"
 )
-
-// NewQueryCurrentPlanRequest creates a new instance of QueryCurrentPlanRequest.
-func NewQueryCurrentPlanRequest() *QueryCurrentPlanRequest {
-	return &QueryCurrentPlanRequest{}
-}
-
-// NewQueryAppliedPlanRequest creates a new instance of QueryAppliedPlanRequest.
-func NewQueryAppliedPlanRequest(name string) *QueryAppliedPlanRequest {
-	return &QueryAppliedPlanRequest{Name: name}
-}