fixed clap group names

common/client-core/src/cli_helpers/client_import_coin_index_signatures.rs

@@ -13,7 +13,7 @@ fn parse_encoded_signatures_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
 #[cfg_attr(feature = "cli", derive(clap::Args))]
 #[cfg_attr(feature = "cli",
     clap(
-        group(clap::ArgGroup::new("signatures_data").required(true)),
+        group(clap::ArgGroup::new("sig_data").required(true)),
     ))
 ]
 pub struct CommonClientImportCoinIndexSignaturesArgs {
@@ -26,11 +26,11 @@ pub struct CommonClientImportCoinIndexSignaturesArgs {
     pub(crate) client_config: PathBuf,
 
     /// Explicitly provide the encoded signatures data (as base58)
-    #[cfg_attr(feature = "cli", clap(long, group = "signatures_data", value_parser = parse_encoded_signatures_data))]
+    #[cfg_attr(feature = "cli", clap(long, group = "sig_data", value_parser = parse_encoded_signatures_data))]
     pub(crate) signatures_data: Option<Vec<u8>>,
 
     /// Specifies the path to file containing binary signatures data
-    #[cfg_attr(feature = "cli", clap(long, group = "signatures_data"))]
+    #[cfg_attr(feature = "cli", clap(long, group = "sig_data"))]
     pub(crate) signatures_path: Option<PathBuf>,
 
     // currently hidden as there exists only a single serialization standard

common/client-core/src/cli_helpers/client_import_expiration_date_signatures.rs

@@ -13,7 +13,7 @@ fn parse_encoded_signatures_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
 #[cfg_attr(feature = "cli", derive(clap::Args))]
 #[cfg_attr(feature = "cli",
     clap(
-        group(clap::ArgGroup::new("signatures_data").required(true)),
+        group(clap::ArgGroup::new("sig_data").required(true)),
     ))
 ]
 pub struct CommonClientImportExpirationDateSignaturesArgs {
@@ -26,11 +26,11 @@ pub struct CommonClientImportExpirationDateSignaturesArgs {
     pub(crate) client_config: PathBuf,
 
     /// Explicitly provide the encoded signatures data (as base58)
-    #[cfg_attr(feature = "cli", clap(long, group = "signatures_data", value_parser = parse_encoded_signatures_data))]
+    #[cfg_attr(feature = "cli", clap(long, group = "sig_data", value_parser = parse_encoded_signatures_data))]
     pub(crate) signatures_data: Option<Vec<u8>>,
 
     /// Specifies the path to file containing binary signatures data
-    #[cfg_attr(feature = "cli", clap(long, group = "signatures_data"))]
+    #[cfg_attr(feature = "cli", clap(long, group = "sig_data"))]
     pub(crate) signatures_path: Option<PathBuf>,
 
     // currently hidden as there exists only a single serialization standard

common/client-core/src/cli_helpers/client_import_master_verification_key.rs

@@ -13,7 +13,7 @@ fn parse_encoded_key_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
 #[cfg_attr(feature = "cli", derive(clap::Args))]
 #[cfg_attr(feature = "cli",
     clap(
-        group(clap::ArgGroup::new("key_data").required(true)),
+        group(clap::ArgGroup::new("key_data_group").required(true)),
     ))
 ]
 pub struct CommonClientImportMasterVerificationKeyArgs {
@@ -26,11 +26,11 @@ pub struct CommonClientImportMasterVerificationKeyArgs {
     pub(crate) client_config: PathBuf,
 
     /// Explicitly provide the encoded key data (as base58)
-    #[cfg_attr(feature = "cli", clap(long, group = "key_data", value_parser = parse_encoded_key_data))]
+    #[cfg_attr(feature = "cli", clap(long, group = "key_data_group", value_parser = parse_encoded_key_data))]
     pub(crate) key_data: Option<Vec<u8>>,
 
     /// Specifies the path to file containing binary key data
-    #[cfg_attr(feature = "cli", clap(long, group = "key_data"))]
+    #[cfg_attr(feature = "cli", clap(long, group = "key_data_group"))]
     pub(crate) key_path: Option<PathBuf>,
 
     // currently hidden as there exists only a single serialization standard

common/commands/src/ecash/import_coin_index_signatures.rs

@@ -16,19 +16,19 @@ fn parse_encoded_signatures_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
 
 #[derive(Debug, Parser)]
 #[clap(
-    group(ArgGroup::new("signatures_data").required(true)),
+    group(ArgGroup::new("sig_data").required(true)),
 )]
 pub struct Args {
     /// Config file of the client that is supposed to use the signatures.
     #[clap(long)]
     pub(crate) client_config: PathBuf,
 
     /// Explicitly provide the encoded signatures data (as base58)
-    #[clap(long, group = "signatures_data", value_parser = parse_encoded_signatures_data)]
+    #[clap(long, group = "sig_data", value_parser = parse_encoded_signatures_data)]
     pub(crate) signatures_data: Option<Vec<u8>>,
 
     /// Specifies the path to file containing binary signatures data
-    #[clap(long, group = "signatures_data")]
+    #[clap(long, group = "sig_data")]
     pub(crate) signatures_path: Option<PathBuf>,
 
     // currently hidden as there exists only a single serialization standard

common/commands/src/ecash/import_expiration_date_signatures.rs

@@ -16,19 +16,19 @@ fn parse_encoded_signatures_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
 
 #[derive(Debug, Parser)]
 #[clap(
-    group(ArgGroup::new("signatures_data").required(true)),
+    group(ArgGroup::new("sig_data").required(true)),
 )]
 pub struct Args {
     /// Config file of the client that is supposed to use the signatures.
     #[clap(long)]
     pub(crate) client_config: PathBuf,
 
     /// Explicitly provide the encoded signatures data (as base58)
-    #[clap(long, group = "signatures_data", value_parser = parse_encoded_signatures_data)]
+    #[clap(long, group = "sig_data", value_parser = parse_encoded_signatures_data)]
     pub(crate) signatures_data: Option<Vec<u8>>,
 
     /// Specifies the path to file containing binary signatures data
-    #[clap(long, group = "signatures_data")]
+    #[clap(long, group = "sig_data")]
     pub(crate) signatures_path: Option<PathBuf>,
 
     // currently hidden as there exists only a single serialization standard

common/commands/src/ecash/import_master_verification_key.rs

@@ -16,19 +16,19 @@ fn parse_encoded_key_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
 
 #[derive(Debug, Parser)]
 #[clap(
-    group(ArgGroup::new("key_data").required(true)),
+    group(ArgGroup::new("key_data_group").required(true)),
 )]
 pub struct Args {
     /// Config file of the client that is supposed to use the key.
     #[clap(long)]
     pub(crate) client_config: PathBuf,
 
     /// Explicitly provide the encoded key data (as base58)
-    #[clap(long, group = "key_data", value_parser = parse_encoded_key_data)]
+    #[clap(long, group = "key_data_group", value_parser = parse_encoded_key_data)]
     pub(crate) key_data: Option<Vec<u8>>,
 
     /// Specifies the path to file containing binary key data
-    #[clap(long, group = "key_data")]
+    #[clap(long, group = "key_data_group")]
     pub(crate) key_path: Option<PathBuf>,
 
     // currently hidden as there exists only a single serialization standard