From 470465d7922df72707782b96e2e1cf42ca655c65 Mon Sep 17 00:00:00 2001
From: atheeshp <59333759+atheeshp@users.noreply.github.com>
Date: Tue, 21 Jul 2020 23:18:37 +0530
Subject: [PATCH] x/auth: cli gRPC migration (#6809)

* migrated auth cli to use grpc query client

* unpacker added for account command

* fxed tests
---
 x/auth/client/cli/query.go | 33 +++++++++++++++++++++------------
 x/auth/module.go           |  4 +++-
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/x/auth/client/cli/query.go b/x/auth/client/cli/query.go
index 6801c96a55..b8643b46eb 100644
--- a/x/auth/client/cli/query.go
+++ b/x/auth/client/cli/query.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -57,18 +58,13 @@ $ <appcli> query auth params
 				return err
 			}
 
-			route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, types.QueryParams)
-			res, _, err := clientCtx.QueryWithData(route, nil)
+			queryClient := types.NewQueryClient(clientCtx)
+			res, err := queryClient.Params(context.Background(), &types.QueryParamsRequest{})
 			if err != nil {
 				return err
 			}
 
-			var params types.Params
-			if err := clientCtx.JSONMarshaler.UnmarshalJSON(res, &params); err != nil {
-				return fmt.Errorf("failed to unmarshal params: %w", err)
-			}
-
-			return clientCtx.PrintOutput(params)
+			return clientCtx.PrintOutput(res.Params)
 		},
 	}
 
@@ -91,19 +87,24 @@ func GetAccountCmd() *cobra.Command {
 				return err
 			}
 
-			accRetriever := types.NewAccountRetriever(clientCtx.JSONMarshaler)
-
 			key, err := sdk.AccAddressFromBech32(args[0])
 			if err != nil {
 				return err
 			}
 
-			acc, err := accRetriever.GetAccount(clientCtx, key)
+			queryClient := types.NewQueryClient(clientCtx)
+			res, err := queryClient.Account(context.Background(), &types.QueryAccountRequest{Address: key})
 			if err != nil {
 				return err
 			}
 
-			return clientCtx.PrintOutput(acc)
+			var account types.AccountI
+			err = clientCtx.InterfaceRegistry.UnpackAny(res.Account, &account)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintOutput(account)
 		},
 	}
 
@@ -130,6 +131,10 @@ $ %s query txs --%s 'message.sender=cosmos1...&message.action=withdraw_delegator
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.ReadQueryCommandFlags(clientCtx, cmd.Flags())
+			if err != nil {
+				return err
+			}
 
 			eventsRaw, _ := cmd.Flags().GetString(flagEvents)
 			eventsStr := strings.Trim(eventsRaw, "'")
@@ -197,6 +202,10 @@ func QueryTxCmd() *cobra.Command {
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.ReadQueryCommandFlags(clientCtx, cmd.Flags())
+			if err != nil {
+				return err
+			}
 
 			output, err := authclient.QueryTx(clientCtx, args[0])
 			if err != nil {
diff --git a/x/auth/module.go b/x/auth/module.go
index 11076eb803..e6bf51f496 100644
--- a/x/auth/module.go
+++ b/x/auth/module.go
@@ -120,7 +120,9 @@ func (am AppModule) NewQuerierHandler() sdk.Querier {
 
 // RegisterQueryService registers a GRPC query service to respond to the
 // module-specific GRPC queries.
-func (am AppModule) RegisterQueryService(grpc.Server) {}
+func (am AppModule) RegisterQueryService(server grpc.Server) {
+	types.RegisterQueryServer(server, am.accountKeeper)
+}
 
 // InitGenesis performs genesis initialization for the auth module. It returns
 // no validator updates.