From 702f7cca2b0e04eb977a0860c57b79a1714240af Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Sat, 10 Dec 2022 17:21:00 +0100
Subject: [PATCH] Revert "feat: add --grpc client option (#14051)"

This reverts commit 7d0a8dc714bd4033f670bb14509fbe4e40616375.
---
 client/cmd.go         | 26 --------------------------
 client/flags/flags.go |  4 ----
 2 files changed, 30 deletions(-)

diff --git a/client/cmd.go b/client/cmd.go
index 8ff09a8f13ac..6d5435d2c3c0 100644
--- a/client/cmd.go
+++ b/client/cmd.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"crypto/tls"
 	"fmt"
 	"strings"
 
@@ -9,9 +8,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/tendermint/tendermint/libs/cli"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
@@ -151,28 +147,6 @@ func ReadPersistentCommandFlags(clientCtx Context, flagSet *pflag.FlagSet) (Cont
 		}
 	}
 
-	if clientCtx.GRPCClient == nil || flagSet.Changed(flags.FlagGRPC) {
-		grpcURI, _ := flagSet.GetString(flags.FlagGRPC)
-		if grpcURI != "" {
-			var dialOpts []grpc.DialOption
-
-			useInsecure, _ := flagSet.GetBool(flags.FlagGRPCInsecure)
-			if useInsecure {
-				dialOpts = append(dialOpts, grpc.WithTransportCredentials(insecure.NewCredentials()))
-			} else {
-				dialOpts = append(dialOpts, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{
-					MinVersion: tls.VersionTLS12,
-				})))
-			}
-
-			grpcClient, err := grpc.Dial(grpcURI, dialOpts...)
-			if err != nil {
-				return Context{}, err
-			}
-			clientCtx = clientCtx.WithGRPCClient(grpcClient)
-		}
-	}
-
 	return clientCtx, nil
 }
 
diff --git a/client/flags/flags.go b/client/flags/flags.go
index daa40e85b97e..80e1eab8ea43 100644
--- a/client/flags/flags.go
+++ b/client/flags/flags.go
@@ -45,8 +45,6 @@ const (
 	FlagUseLedger        = "ledger"
 	FlagChainID          = "chain-id"
 	FlagNode             = "node"
-	FlagGRPC             = "grpc"
-	FlagGRPCInsecure     = "grpc-insecure"
 	FlagHeight           = "height"
 	FlagGasAdjustment    = "gas-adjustment"
 	FlagFrom             = "from"
@@ -94,8 +92,6 @@ var LineBreak = &cobra.Command{Run: func(*cobra.Command, []string) {}}
 // AddQueryFlagsToCmd adds common flags to a module query command.
 func AddQueryFlagsToCmd(cmd *cobra.Command) {
 	cmd.Flags().String(FlagNode, "tcp://localhost:26657", "<host>:<port> to Tendermint RPC interface for this chain")
-	cmd.Flags().String(FlagGRPC, "", "the gRPC endpoint to use for this chain")
-	cmd.Flags().Bool(FlagGRPCInsecure, false, "allow gRPC over insecure channels, if not TLS the server must use TLS")
 	cmd.Flags().Int64(FlagHeight, 0, "Use a specific height to query state at (this can error if the node is pruning state)")
 	cmd.Flags().StringP(FlagOutput, "o", "text", "Output format (text|json)")