Modify query request and revert changes in querier

cosmos · Jul 8, 2020 · e2ab7fd · e2ab7fd
1 parent 77528b7
commit e2ab7fd
Show file tree

Hide file tree

Showing 8 changed files with 120 additions and 92 deletions.
diff --git a/proto/cosmos/params/query.proto b/proto/cosmos/params/query.proto
@@ -9,17 +9,17 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/params/types/proposal";
 // Query creates service with Parameters as rpc
 service Query{
     // Parameters queries all params
-    rpc Parameters (QueryParametersRequest) returns (QueryParametersResponse) {}
+    rpc Parameters (QuerySubspaceParamsRequest) returns (QuerySubspaceParamsResponse) {}
 }
 
-// QueryParametersRequest is request type for the Query/Parameters RPC method
-message QueryParametersRequest{
+// QuerySubspaceParamsRequest is request type for the Query/Parameters RPC method
+message QuerySubspaceParamsRequest{
     string subspace = 1;
 
     string key = 2;
 }
 
-// QueryParametersResponse is response type for the Query/Parameters RPC method
-message QueryParametersResponse{
+// QuerySubspaceParamsResponse is response type for the Query/Parameters RPC method
+message QuerySubspaceParamsResponse{
     cosmos.params.ParamChange params = 1 [(gogoproto.nullable) = false];
 } 
diff --git a/x/params/client/cli/query.go b/x/params/client/cli/query.go
@@ -9,7 +9,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/x/params/types"
-	"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
 )
 
 // NewQueryCmd returns a root CLI command handler for all x/params query commands.
@@ -37,7 +36,7 @@ func NewQuerySubspaceParamsCmd(m codec.JSONMarshaler) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.NewContext().WithJSONMarshaler(m)
 
-			params := proposal.NewQueryParametersRequest(args[0], args[1])
+			params := types.NewQuerySubspaceParams(args[0], args[1])
 			route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, types.QueryParams)
 
 			bz, err := m.MarshalJSON(params)
@@ -50,7 +49,7 @@ func NewQuerySubspaceParamsCmd(m codec.JSONMarshaler) *cobra.Command {
 				return err
 			}
 
-			var resp proposal.ParamChange
+			var resp types.SubspaceParamsResponse
 			if err := m.UnmarshalJSON(bz, &resp); err != nil {
 				return err
 			}

diff --git a/x/params/keeper/grpc_query.go b/x/params/keeper/grpc_query.go
@@ -14,7 +14,7 @@ import (
 var _ proposal.QueryServer = Keeper{}
 
 // Parameters returns subspace params
-func (k Keeper) Parameters(c context.Context, req *proposal.QueryParametersRequest) (*proposal.QueryParametersResponse, error) {
+func (k Keeper) Parameters(c context.Context, req *proposal.QuerySubspaceParamsRequest) (*proposal.QuerySubspaceParamsResponse, error) {
 	if req == nil {
 		return nil, status.Errorf(codes.InvalidArgument, "empty request")
 	}
@@ -32,5 +32,5 @@ func (k Keeper) Parameters(c context.Context, req *proposal.QueryParametersReque
 	rawValue := ss.GetRaw(ctx, []byte(req.Key))
 	params := proposal.NewParamChange(req.Subspace, req.Key, string(rawValue))
 
-	return &proposal.QueryParametersResponse{Params: params}, nil
+	return &proposal.QuerySubspaceParamsResponse{Params: params}, nil
 }
diff --git a/x/params/keeper/grpc_query_test.go b/x/params/keeper/grpc_query_test.go
@@ -10,7 +10,7 @@ import (
 
 func (suite *KeeperTestSuite) TestGRPCQueryParams() {
 	var (
-		req      *proposal.QueryParametersRequest
+		req      *proposal.QuerySubspaceParamsRequest
 		expValue string
 		space    types.Subspace
 	)
@@ -24,21 +24,21 @@ func (suite *KeeperTestSuite) TestGRPCQueryParams() {
 		{
 			"empty request",
 			func() {
-				req = &proposal.QueryParametersRequest{}
+				req = &proposal.QuerySubspaceParamsRequest{}
 			},
 			false,
 		},
 		{
 			"invalid request with subspace not found",
 			func() {
-				req = &proposal.QueryParametersRequest{Subspace: "test"}
+				req = &proposal.QuerySubspaceParamsRequest{Subspace: "test"}
 			},
 			false,
 		},
 		{
 			"invalid request with subspace and key not found",
 			func() {
-				req = &proposal.QueryParametersRequest{Subspace: "test", Key: "key"}
+				req = &proposal.QuerySubspaceParamsRequest{Subspace: "test", Key: "key"}
 			},
 			false,
 		},
@@ -47,7 +47,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryParams() {
 			func() {
 				space = suite.app.ParamsKeeper.Subspace("test").
 					WithKeyTable(types.NewKeyTable(types.NewParamSetPair(key, paramJSON{}, validateNoOp)))
-				req = &proposal.QueryParametersRequest{Subspace: "test", Key: "key"}
+				req = &proposal.QuerySubspaceParamsRequest{Subspace: "test", Key: "key"}
 				expValue = ""
 			},
 			true,
@@ -57,7 +57,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryParams() {
 			func() {
 				err := space.Update(suite.ctx, key, []byte(`{"param1":"10241024"}`))
 				suite.Require().NoError(err)
-				req = &proposal.QueryParametersRequest{Subspace: "test", Key: "key"}
+				req = &proposal.QuerySubspaceParamsRequest{Subspace: "test", Key: "key"}
 				expValue = `{"param1":"10241024"}`
 			},
 			true,

diff --git a/x/params/keeper/querier.go b/x/params/keeper/querier.go
@@ -25,7 +25,7 @@ func NewQuerier(k Keeper) sdk.Querier {
 }
 
 func queryParams(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
-	var params proposal.QueryParametersRequest
+	var params types.QuerySubspaceParams
 
 	if err := legacy.Cdc.UnmarshalJSON(req.Data, &params); err != nil {
 		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
@@ -37,7 +37,7 @@ func queryParams(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, erro
 	}
 
 	rawValue := ss.GetRaw(ctx, []byte(params.Key))
-	resp := proposal.NewParamChange(params.Subspace, params.Key, string(rawValue))
+	resp := types.NewSubspaceParamsResponse(params.Subspace, params.Key, string(rawValue))
 
 	bz, err := codec.MarshalJSONIndent(legacy.Cdc, resp)
 	if err != nil {

diff --git a/x/params/types/proposal/proposal.go b/x/params/types/proposal/proposal.go
@@ -101,9 +101,9 @@ func ValidateChanges(changes []ParamChange) error {
 	return nil
 }
 
-// NewQueryParametersRequest returns the new instance of QueryParametersRequest
-func NewQueryParametersRequest(ss, key string) *QueryParametersRequest {
-	return &QueryParametersRequest{
+// NewQuerySubspaceParamsRequest returns the new instance of QuerySubspaceParamsRequest
+func NewQuerySubspaceParamsRequest(ss, key string) *QuerySubspaceParamsRequest {
+	return &QuerySubspaceParamsRequest{
 		Subspace: ss,
 		Key:      key,
 	}