Add Superfluid Params Query (#1063)

* sf params * query proto change * added generated proto * keeper updates (cherry picked from commit 9f64276)
osmosis-labs · Mar 9, 2022 · 4216f19 · 4216f19
1 parent e4a68a2
commit 4216f19
Show file tree

Hide file tree

Showing 6 changed files with 189 additions and 156 deletions.
diff --git a/proto/osmosis/superfluid/query.proto b/proto/osmosis/superfluid/query.proto
@@ -16,7 +16,7 @@ option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types";
 // Query defines the gRPC querier service.
 service Query {
   // Params returns the total set of minting parameters.
-  rpc Params(ParamsRequest) returns (ParamsResponse) {
+  rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
     option (google.api.http).get = "/osmosis/superfluid/v1beta1/params";
   }
 
@@ -114,8 +114,8 @@ service Query {
   // }
 }
 
-message ParamsRequest {}
-message ParamsResponse {
+message QueryParamsRequest {}
+message QueryParamsResponse {
   // params defines the parameters of the module.
   Params params = 1 [ (gogoproto.nullable) = false ];
 }

diff --git a/x/superfluid/client/cli/query.go b/x/superfluid/client/cli/query.go
@@ -24,6 +24,7 @@ func GetQueryCmd(queryRoute string) *cobra.Command {
 	}
 
 	cmd.AddCommand(
+		GetCmdQueryParams(),
 		GetCmdAllSuperfluidAssets(),
 		GetCmdAssetMultiplier(),
 		GetCmdAllIntermediaryAccounts(),
@@ -37,6 +38,38 @@ func GetQueryCmd(queryRoute string) *cobra.Command {
 	return cmd
 }
 
+// GetCmdQueryParams implements a command to fetch superfluid parameters.
+func GetCmdQueryParams() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "params",
+		Short: "Query the current superfluid parameters",
+		Args:  cobra.NoArgs,
+		Long: strings.TrimSpace(`Query parameters for the superfluid module:
+
+$ <appd> query superfluid params
+`),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+			queryClient := types.NewQueryClient(clientCtx)
+
+			params := &types.QueryParamsRequest{}
+			res, err := queryClient.Params(cmd.Context(), params)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(&res.Params)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+
+	return cmd
+}
+
 // GetCmdAllSuperfluidAssets returns all superfluid enabled assets
 func GetCmdAllSuperfluidAssets() *cobra.Command {
 	cmd := &cobra.Command{

diff --git a/x/superfluid/keeper/grpc_query.go b/x/superfluid/keeper/grpc_query.go
@@ -14,12 +14,12 @@ import (
 var _ types.QueryServer = Keeper{}
 
 // Params returns the superfluid module params
-func (k Keeper) Params(goCtx context.Context, req *types.ParamsRequest) (*types.ParamsResponse, error) {
+func (k Keeper) Params(goCtx context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	params := k.GetParams(ctx)
 
-	return &types.ParamsResponse{
+	return &types.QueryParamsResponse{
 		Params: params,
 	}, nil
 }

diff --git a/x/superfluid/keeper/grpc_query_test.go b/x/superfluid/keeper/grpc_query_test.go
@@ -9,7 +9,7 @@ import (
 
 func (suite *KeeperTestSuite) TestGRPCParams() {
 	suite.SetupTest()
-	res, err := suite.App.SuperfluidKeeper.Params(sdk.WrapSDKContext(suite.Ctx), &types.ParamsRequest{})
+	res, err := suite.App.SuperfluidKeeper.Params(sdk.WrapSDKContext(suite.Ctx), &types.QueryParamsRequest{})
 	suite.Require().NoError(err)
 	suite.Require().True(res.Params.MinimumRiskFactor.Equal(types.DefaultParams().MinimumRiskFactor))
 }