From 63b1890ad2652091c0f074767a3b18e4db3ef7a6 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 1/2] refactor: hide `--output` flags that don't work (#17188) Co-authored-by: Julien Robert (cherry picked from commit 0b5e7ed0af567a5be49f0dd0d7a0f2062042c9fd) # Conflicts: # x/auth/client/cli/tx_multisign.go --- x/auth/client/cli/decode.go | 1 + x/auth/client/cli/encode.go | 1 + x/auth/client/cli/tx_multisign.go | 18 ++++++++++++------ x/genutil/client/cli/gentx.go | 1 + 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/x/auth/client/cli/decode.go b/x/auth/client/cli/decode.go index 72a8a600ce73..2d49806b1244 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 0a04c7c21665..65a13c6d1ae5 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 b1fd2525c3cf..965db3e2e9be 100644 --- a/x/auth/client/cli/tx_multisign.go +++ b/x/auth/client/cli/tx_multisign.go @@ -65,6 +65,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") cmd.Flags().Bool(flagAmino, false, "Generate Amino-encoded JSON suitable for submitting to the txs REST endpoint") flags.AddTxFlagsToCmd(cmd) + _ = cmd.Flags().MarkHidden(flags.FlagOutput) return cmd } @@ -188,6 +189,7 @@ func makeMultiSignCmd() func(cmd *cobra.Command, args []string) (err error) { } } +<<<<<<< HEAD outputDoc, _ := cmd.Flags().GetString(flags.FlagOutputDocument) if outputDoc == "" { cmd.Printf("%s\n", json) @@ -195,20 +197,23 @@ func makeMultiSignCmd() func(cmd *cobra.Command, args []string) (err error) { } fp, err := os.OpenFile(outputDoc, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o644) +======= + closeFunc, err := setOutputFile(cmd) +>>>>>>> 0b5e7ed0a (refactor: hide `--output` flags that don't work (#17188)) if err != nil { return err } - defer func() { - err2 := fp.Close() - if err == nil { - err = err2 - } - }() + defer closeFunc() +<<<<<<< HEAD err = clientCtx.PrintBytes(json) return +======= + cmd.Printf("%s\n", json) + return nil +>>>>>>> 0b5e7ed0a (refactor: hide `--output` flags that don't work (#17188)) } } @@ -243,6 +248,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 4d5b31aaa13d..86cc185e004e 100644 --- a/x/genutil/client/cli/gentx.go +++ b/x/genutil/client/cli/gentx.go @@ -213,6 +213,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 } From 0e9df20c85b06e5411c4afcd9a481bf86513c5d1 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Sun, 30 Jul 2023 02:07:01 +0200 Subject: [PATCH 2/2] fix conflict + changelog --- CHANGELOG.md | 4 ++++ x/auth/client/cli/tx_multisign.go | 16 ---------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 196e98c3c02f..d99901f0e169 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] +### Bug Fixes + +* (cli) [#17188](https://github.com/cosmos/cosmos-sdk/pull/17188) Fix `--output-document` flag in `tx multi-sign`. + ## [v0.47.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.4) - 2023-07-17 ### Features diff --git a/x/auth/client/cli/tx_multisign.go b/x/auth/client/cli/tx_multisign.go index 965db3e2e9be..049a36f211c3 100644 --- a/x/auth/client/cli/tx_multisign.go +++ b/x/auth/client/cli/tx_multisign.go @@ -189,31 +189,15 @@ func makeMultiSignCmd() func(cmd *cobra.Command, args []string) (err error) { } } -<<<<<<< HEAD - outputDoc, _ := cmd.Flags().GetString(flags.FlagOutputDocument) - if outputDoc == "" { - cmd.Printf("%s\n", json) - return - } - - fp, err := os.OpenFile(outputDoc, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o644) -======= closeFunc, err := setOutputFile(cmd) ->>>>>>> 0b5e7ed0a (refactor: hide `--output` flags that don't work (#17188)) if err != nil { return err } defer closeFunc() -<<<<<<< HEAD - err = clientCtx.PrintBytes(json) - - return -======= cmd.Printf("%s\n", json) return nil ->>>>>>> 0b5e7ed0a (refactor: hide `--output` flags that don't work (#17188)) } }