From 442b712d230b0fd37859345bb59f7d1053fd55ec Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Mon, 30 May 2022 11:46:26 +0200 Subject: [PATCH 1/2] add actual parameter example to denom-trace and denom-hash CLI queries (#1442) (cherry picked from commit 8062d014956682b153f82e247d943310f5ff62a9) # Conflicts: # modules/apps/transfer/client/cli/query.go --- modules/apps/transfer/client/cli/query.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/apps/transfer/client/cli/query.go b/modules/apps/transfer/client/cli/query.go index c64e278d387..328069b6d34 100644 --- a/modules/apps/transfer/client/cli/query.go +++ b/modules/apps/transfer/client/cli/query.go @@ -14,10 +14,17 @@ import ( // GetCmdQueryDenomTrace defines the command to query a a denomination trace from a given hash. func GetCmdQueryDenomTrace() *cobra.Command { cmd := &cobra.Command{ +<<<<<<< HEAD Use: "denom-trace [hash]", Short: "Query the denom trace info from a given trace hash", Long: "Query the denom trace info from a given trace hash", Example: fmt.Sprintf("%s query ibc-transfer denom-trace [hash]", version.AppName), +======= + Use: "denom-trace [hash/denom]", + Short: "Query the denom trace info from a given trace hash or ibc denom", + Long: "Query the denom trace info from a given trace hash or ibc denom", + Example: fmt.Sprintf("%s query ibc-transfer denom-trace 27A6394C3F9FF9C9DCF5DFFADF9BB5FE9A37C7E92B006199894CF1824DF9AC7C", version.AppName), +>>>>>>> 8062d01 (add actual parameter example to denom-trace and denom-hash CLI queries (#1442)) Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientQueryContext(cmd) @@ -138,7 +145,7 @@ func GetCmdQueryDenomHash() *cobra.Command { Use: "denom-hash [trace]", Short: "Query the denom hash info from a given denom trace", Long: "Query the denom hash info from a given denom trace", - Example: fmt.Sprintf("%s query ibc-transfer denom-hash [denom_trace]", version.AppName), + Example: fmt.Sprintf("%s query ibc-transfer denom-hash transfer/channel-0/uatom", version.AppName), Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientQueryContext(cmd) From 0d4c67e6dc2e711f6e647f35c74bb33a4ac9bffb Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Mon, 30 May 2022 12:32:16 +0200 Subject: [PATCH 2/2] fix conflict --- modules/apps/transfer/client/cli/query.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/apps/transfer/client/cli/query.go b/modules/apps/transfer/client/cli/query.go index 328069b6d34..fef35975154 100644 --- a/modules/apps/transfer/client/cli/query.go +++ b/modules/apps/transfer/client/cli/query.go @@ -14,17 +14,10 @@ import ( // GetCmdQueryDenomTrace defines the command to query a a denomination trace from a given hash. func GetCmdQueryDenomTrace() *cobra.Command { cmd := &cobra.Command{ -<<<<<<< HEAD Use: "denom-trace [hash]", Short: "Query the denom trace info from a given trace hash", Long: "Query the denom trace info from a given trace hash", - Example: fmt.Sprintf("%s query ibc-transfer denom-trace [hash]", version.AppName), -======= - Use: "denom-trace [hash/denom]", - Short: "Query the denom trace info from a given trace hash or ibc denom", - Long: "Query the denom trace info from a given trace hash or ibc denom", Example: fmt.Sprintf("%s query ibc-transfer denom-trace 27A6394C3F9FF9C9DCF5DFFADF9BB5FE9A37C7E92B006199894CF1824DF9AC7C", version.AppName), ->>>>>>> 8062d01 (add actual parameter example to denom-trace and denom-hash CLI queries (#1442)) Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientQueryContext(cmd)