Added payout related queries in CLI

sentinel-official · Aug 13, 2023 · a8815a8 · a8815a8
1 parent f901725
commit a8815a8
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 22 deletions.
diff --git a/x/deposit/client/cli/query.go b/x/deposit/client/cli/query.go
@@ -15,7 +15,7 @@ import (
 
 func queryDeposit() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "deposit [address]",
+		Use:   "deposit [account-addr]",
 		Short: "Query a deposit",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {

diff --git a/x/node/client/cli/query.go b/x/node/client/cli/query.go
@@ -81,7 +81,7 @@ func queryNodes() *cobra.Command {
 				qc = types.NewQueryServiceClient(ctx)
 			)
 
-			if id > 0 {
+			if id != 0 {
 				res, err := qc.QueryNodesForPlan(
 					context.Background(),
 					types.NewQueryNodesForPlanRequest(
@@ -115,7 +115,7 @@ func queryNodes() *cobra.Command {
 	flags.AddQueryFlagsToCmd(cmd)
 	flags.AddPaginationFlagsToCmd(cmd, "nodes")
 	cmd.Flags().String(hubtypes.FlagStatus, "", "filter the nodes by status (active|inactive)")
-	cmd.Flags().Uint64(flagPlan, 0, "query the nodes of a subscription plan")
+	cmd.Flags().Uint64(flagPlan, 0, "filter the nodes by subscription plan")
 
 	return cmd
 }

diff --git a/x/plan/client/cli/query.go b/x/plan/client/cli/query.go
@@ -114,8 +114,8 @@ func queryPlans() *cobra.Command {
 
 	flags.AddQueryFlagsToCmd(cmd)
 	flags.AddPaginationFlagsToCmd(cmd, "plans")
-	cmd.Flags().String(flagProvider, "", "filter by provider address")
-	cmd.Flags().String(flagStatus, "", "filter by status")
+	cmd.Flags().String(flagProvider, "", "filter the plans by provider address")
+	cmd.Flags().String(flagStatus, "", "filter the plans by by status (active|inactive)")
 
 	return cmd
 }
diff --git a/x/provider/client/cli/query.go b/x/provider/client/cli/query.go
@@ -15,7 +15,7 @@ import (
 
 func queryProvider() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "provider [address]",
+		Use:   "provider [provider-addr]",
 		Short: "Query a provider",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {

diff --git a/x/session/client/cli/query.go b/x/session/client/cli/query.go
@@ -15,7 +15,7 @@ import (
 
 func querySession() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "session [id]",
+		Use:   "session [session-id]",
 		Short: "Query a session",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -86,7 +86,7 @@ func querySessions() *cobra.Command {
 				qc = types.NewQueryServiceClient(ctx)
 			)
 
-			if !accAddr.Empty() {
+			if accAddr != nil {
 				res, err := qc.QuerySessionsForAccount(
 					context.Background(),
 					types.NewQuerySessionsForAccountRequest(
@@ -101,7 +101,7 @@ func querySessions() *cobra.Command {
 				return ctx.PrintProto(res)
 			}
 
-			if !nodeAddr.Empty() {
+			if nodeAddr != nil {
 				res, err := qc.QuerySessionsForNode(
 					context.Background(),
 					types.NewQuerySessionsForNodeRequest(
@@ -116,7 +116,7 @@ func querySessions() *cobra.Command {
 				return ctx.PrintProto(res)
 			}
 
-			if subscriptionID > 0 {
+			if subscriptionID != 0 {
 				res, err := qc.QuerySessionsForSubscription(
 					context.Background(),
 					types.NewQuerySessionsForSubscriptionRequest(
@@ -147,9 +147,9 @@ func querySessions() *cobra.Command {
 
 	flags.AddQueryFlagsToCmd(cmd)
 	flags.AddPaginationFlagsToCmd(cmd, "sessions")
-	cmd.Flags().String(flagAddress, "", "query the sessions of an account address")
-	cmd.Flags().String(flagNodeAddress, "", "query the sessions of a node address")
-	cmd.Flags().Uint64(flagSubscriptionID, 0, "query the sessions of a subscription id")
+	cmd.Flags().String(flagAddress, "", "filter the sessions by an account address")
+	cmd.Flags().String(flagNodeAddress, "", "filter the sessions by a node address")
+	cmd.Flags().Uint64(flagSubscriptionID, 0, "filter the sessions by a subscription id")
 
 	return cmd
 }

diff --git a/x/session/client/cli/tx.go b/x/session/client/cli/tx.go
@@ -116,7 +116,7 @@ func txUpdateDetails() *cobra.Command {
 
 func txEnd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "end [id]",
+		Use:   "end [session-id]",
 		Short: "End a session",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {

diff --git a/x/subscription/client/cli/query.go b/x/subscription/client/cli/query.go
@@ -87,7 +87,7 @@ func querySubscriptions() *cobra.Command {
 				qc = types.NewQueryServiceClient(ctx)
 			)
 
-			if !accAddr.Empty() {
+			if accAddr != nil {
 				res, err := qc.QuerySubscriptionsForAccount(
 					context.Background(),
 					types.NewQuerySubscriptionsForAccountRequest(
@@ -100,7 +100,8 @@ func querySubscriptions() *cobra.Command {
 				}
 
 				return ctx.PrintProto(res)
-			} else if !nodeAddr.Empty() {
+			}
+			if nodeAddr != nil {
 				res, err := qc.QuerySubscriptionsForNode(
 					context.Background(),
 					types.NewQuerySubscriptionsForNodeRequest(
@@ -113,7 +114,8 @@ func querySubscriptions() *cobra.Command {
 				}
 
 				return ctx.PrintProto(res)
-			} else if planID > 0 {
+			}
+			if planID != 0 {
 				res, err := qc.QuerySubscriptionsForPlan(
 					context.Background(),
 					types.NewQuerySubscriptionsForPlanRequest(
@@ -144,9 +146,9 @@ func querySubscriptions() *cobra.Command {
 
 	flags.AddQueryFlagsToCmd(cmd)
 	flags.AddPaginationFlagsToCmd(cmd, "subscriptions")
-	cmd.Flags().String(flagAccountAddress, "", "query the subscriptions of an account address")
-	cmd.Flags().String(flagNodeAddress, "", "query the subscriptions of a node address")
-	cmd.Flags().Uint64(flagPlanID, 0, "query the subscriptions of a subscription plan")
+	cmd.Flags().String(flagAccountAddress, "", "filter the subscriptions by an account address")
+	cmd.Flags().String(flagNodeAddress, "", "filter the subscriptions by a node address")
+	cmd.Flags().Uint64(flagPlanID, 0, "filter the subscriptions by a subscription plan")
 
 	return cmd
 }
@@ -291,6 +293,16 @@ func queryPayouts() *cobra.Command {
 				return err
 			}
 
+			accAddr, err := GetAccountAddress(cmd.Flags())
+			if err != nil {
+				return err
+			}
+
+			nodeAddr, err := GetNodeAddress(cmd.Flags())
+			if err != nil {
+				return err
+			}
+
 			pagination, err := client.ReadPageRequest(cmd.Flags())
 			if err != nil {
 				return err
@@ -300,6 +312,35 @@ func queryPayouts() *cobra.Command {
 				qc = types.NewQueryServiceClient(ctx)
 			)
 
+			if accAddr != nil {
+				res, err := qc.QueryPayoutsForAccount(
+					context.Background(),
+					types.NewQueryPayoutsForAccountRequest(
+						accAddr,
+						pagination,
+					),
+				)
+				if err != nil {
+					return err
+				}
+
+				return ctx.PrintProto(res)
+			}
+			if nodeAddr != nil {
+				res, err := qc.QueryPayoutsForNode(
+					context.Background(),
+					types.NewQueryPayoutsForNodeRequest(
+						nodeAddr,
+						pagination,
+					),
+				)
+				if err != nil {
+					return err
+				}
+
+				return ctx.PrintProto(res)
+			}
+
 			res, err := qc.QueryPayouts(
 				context.Background(),
 				types.NewQueryPayoutsRequest(
@@ -316,6 +357,8 @@ func queryPayouts() *cobra.Command {
 
 	flags.AddQueryFlagsToCmd(cmd)
 	flags.AddPaginationFlagsToCmd(cmd, "payouts")
+	cmd.Flags().String(flagAccountAddress, "", "filter the subscriptions by an account address")
+	cmd.Flags().String(flagNodeAddress, "", "filter the subscriptions by a node address")
 
 	return cmd
 }

diff --git a/x/subscription/types/querier.go b/x/subscription/types/querier.go
@@ -66,8 +66,8 @@ func NewQueryPayoutsRequest(pagination *query.PageRequest) *QueryPayoutsRequest
 	}
 }
 
-func NewQueryPayoutsForAccountRequest(addr sdk.AccAddress, pagination *query.PageRequest) *QueryPayoutsForNodeRequest {
-	return &QueryPayoutsForNodeRequest{
+func NewQueryPayoutsForAccountRequest(addr sdk.AccAddress, pagination *query.PageRequest) *QueryPayoutsForAccountRequest {
+	return &QueryPayoutsForAccountRequest{
 		Address:    addr.String(),
 		Pagination: pagination,
 	}