From 0b5e7ed0af567a5be49f0dd0d7a0f2062042c9fd Mon Sep 17 00:00:00 2001
From: zakir-code <80246097+zakir-code@users.noreply.github.com>
Date: Sun, 30 Jul 2023 07:53:27 +0800
Subject: [PATCH] refactor: hide `--output` flags that don't work (#17188)

Co-authored-by: Julien Robert <julien@rbrt.fr>
---
 x/auth/client/cli/decode.go       |  1 +
 x/auth/client/cli/encode.go       |  1 +
 x/auth/client/cli/tx_multisign.go | 22 ++++++----------------
 x/genutil/client/cli/gentx.go     |  1 +
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/x/auth/client/cli/decode.go b/x/auth/client/cli/decode.go
index 72a8a600ce..2d49806b12 100644
--- a/x/auth/client/cli/decode.go
+++ b/x/auth/client/cli/decode.go
@@ -48,6 +48,7 @@ func GetDecodeCommand() *cobra.Command {
 
 	cmd.Flags().BoolP(flagHex, "x", false, "Treat input as hexadecimal instead of base64")
 	flags.AddTxFlagsToCmd(cmd)
+	_ = cmd.Flags().MarkHidden(flags.FlagOutput) // decoding makes sense to output only json
 
 	return cmd
 }
diff --git a/x/auth/client/cli/encode.go b/x/auth/client/cli/encode.go
index 0a04c7c216..65a13c6d1a 100644
--- a/x/auth/client/cli/encode.go
+++ b/x/auth/client/cli/encode.go
@@ -42,6 +42,7 @@ If you supply a dash (-) argument in place of an input filename, the command rea
 	}
 
 	flags.AddTxFlagsToCmd(cmd)
+	_ = cmd.Flags().MarkHidden(flags.FlagOutput) // encoding makes sense to output only json
 
 	return cmd
 }
diff --git a/x/auth/client/cli/tx_multisign.go b/x/auth/client/cli/tx_multisign.go
index 747c1f09a1..b033b646f3 100644
--- a/x/auth/client/cli/tx_multisign.go
+++ b/x/auth/client/cli/tx_multisign.go
@@ -61,6 +61,7 @@ The SIGN_MODE_DIRECT sign mode is not supported.'
 	cmd.Flags().Bool(flagSigOnly, false, "Print only the generated signature, then exit")
 	cmd.Flags().String(flags.FlagOutputDocument, "", "The document is written to the given file instead of STDOUT")
 	flags.AddTxFlagsToCmd(cmd)
+	_ = cmd.Flags().MarkHidden(flags.FlagOutput)
 
 	return cmd
 }
@@ -180,27 +181,15 @@ func makeMultiSignCmd() func(cmd *cobra.Command, args []string) (err error) {
 			return err
 		}
 
-		outputDoc, _ := cmd.Flags().GetString(flags.FlagOutputDocument)
-		if outputDoc == "" {
-			cmd.Printf("%s\n", json)
-			return nil
-		}
-
-		fp, err := os.OpenFile(outputDoc, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o644)
+		closeFunc, err := setOutputFile(cmd)
 		if err != nil {
 			return err
 		}
 
-		defer func() {
-			err2 := fp.Close()
-			if err == nil {
-				err = err2
-			}
-		}()
+		defer closeFunc()
 
-		err = clientCtx.PrintBytes(json)
-
-		return err
+		cmd.Printf("%s\n", json)
+		return nil
 	}
 }
 
@@ -235,6 +224,7 @@ The SIGN_MODE_DIRECT sign mode is not supported.'
 	)
 	cmd.Flags().String(flags.FlagOutputDocument, "", "The document is written to the given file instead of STDOUT")
 	flags.AddTxFlagsToCmd(cmd)
+	_ = cmd.Flags().MarkHidden(flags.FlagOutput) // signing makes sense to output only json
 
 	return cmd
 }
diff --git a/x/genutil/client/cli/gentx.go b/x/genutil/client/cli/gentx.go
index ce1b91e08e..7c5ee6f7f9 100644
--- a/x/genutil/client/cli/gentx.go
+++ b/x/genutil/client/cli/gentx.go
@@ -216,6 +216,7 @@ $ %s gentx my-key-name 1000000stake --home=/path/to/home/dir --keyring-backend=o
 	cmd.Flags().String(flags.FlagOutputDocument, "", "Write the genesis transaction JSON document to the given file instead of the default location")
 	cmd.Flags().AddFlagSet(fsCreateValidator)
 	flags.AddTxFlagsToCmd(cmd)
+	_ = cmd.Flags().MarkHidden(flags.FlagOutput) // signing makes sense to output only json
 
 	return cmd
 }