From 99392a9b6742954630486f7a2e08a6aa524e251e Mon Sep 17 00:00:00 2001 From: lilasxie Date: Thu, 12 Sep 2024 15:08:12 +0800 Subject: [PATCH 1/2] docs(client/debug): correct `debug raw-bytes` command example (#21671) (cherry picked from commit 0fc06f14104b33f36839d59f5e3d88bf7d179c41) # Conflicts: # client/debug/main.go --- client/debug/main.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/client/debug/main.go b/client/debug/main.go index dc1924fe195c..50a1b321f1b0 100644 --- a/client/debug/main.go +++ b/client/debug/main.go @@ -298,6 +298,7 @@ $ %s debug addr cosmos1e0jnq2sun3dzjh8p2xq95kk0expwmd7shwjpfg func RawBytesCmd() *cobra.Command { return &cobra.Command{ +<<<<<<< HEAD Use: "raw-bytes [raw-bytes]", Short: "Convert raw bytes output (eg. [10 21 13 255]) to hex", Long: fmt.Sprintf(`Convert raw-bytes to hex. @@ -306,6 +307,13 @@ Example: $ %s debug raw-bytes [72 101 108 108 111 44 32 112 108 97 121 103 114 111 117 110 100] `, version.AppName), Args: cobra.ExactArgs(1), +======= + Use: "raw-bytes ", + Short: "Convert raw bytes output (eg. [10 21 13 255]) to hex", + Long: "Convert raw-bytes to hex.", + Example: fmt.Sprintf("%s debug raw-bytes '[72 101 108 108 111 44 32 112 108 97 121 103 114 111 117 110 100]'", version.AppName), + Args: cobra.ExactArgs(1), +>>>>>>> 0fc06f141 (docs(client/debug): correct `debug raw-bytes` command example (#21671)) RunE: func(_ *cobra.Command, args []string) error { stringBytes := args[0] stringBytes = strings.Trim(stringBytes, "[") From fd467cc4ee1d21f97e81c59308ad3d6f22662097 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Thu, 12 Sep 2024 09:57:59 +0200 Subject: [PATCH 2/2] updates --- client/debug/main.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/client/debug/main.go b/client/debug/main.go index 50a1b321f1b0..1c02a2257da7 100644 --- a/client/debug/main.go +++ b/client/debug/main.go @@ -298,22 +298,11 @@ $ %s debug addr cosmos1e0jnq2sun3dzjh8p2xq95kk0expwmd7shwjpfg func RawBytesCmd() *cobra.Command { return &cobra.Command{ -<<<<<<< HEAD - Use: "raw-bytes [raw-bytes]", - Short: "Convert raw bytes output (eg. [10 21 13 255]) to hex", - Long: fmt.Sprintf(`Convert raw-bytes to hex. - -Example: -$ %s debug raw-bytes [72 101 108 108 111 44 32 112 108 97 121 103 114 111 117 110 100] - `, version.AppName), - Args: cobra.ExactArgs(1), -======= Use: "raw-bytes ", Short: "Convert raw bytes output (eg. [10 21 13 255]) to hex", Long: "Convert raw-bytes to hex.", Example: fmt.Sprintf("%s debug raw-bytes '[72 101 108 108 111 44 32 112 108 97 121 103 114 111 117 110 100]'", version.AppName), Args: cobra.ExactArgs(1), ->>>>>>> 0fc06f141 (docs(client/debug): correct `debug raw-bytes` command example (#21671)) RunE: func(_ *cobra.Command, args []string) error { stringBytes := args[0] stringBytes = strings.Trim(stringBytes, "[")