diff --git a/service-providers/network-requester/src/cli/build_info.rs b/service-providers/network-requester/src/cli/build_info.rs index e3385bb933..55dc3bfd3f 100644 --- a/service-providers/network-requester/src/cli/build_info.rs +++ b/service-providers/network-requester/src/cli/build_info.rs @@ -7,7 +7,7 @@ use nym_bin_common::output_format::OutputFormat; #[derive(Args)] pub(crate) struct BuildInfo { - #[clap(short, long, default_value_t = OutputFormat::default())] + #[arg(short, long, default_value_t = OutputFormat::default())] output: OutputFormat, } diff --git a/service-providers/network-requester/src/cli/init.rs b/service-providers/network-requester/src/cli/init.rs index 30797dc26e..9cd092fc89 100644 --- a/service-providers/network-requester/src/cli/init.rs +++ b/service-providers/network-requester/src/cli/init.rs @@ -24,38 +24,38 @@ use tap::TapFallible; #[derive(Args, Clone)] pub(crate) struct Init { /// Id of the nym-mixnet-client we want to create config for. - #[clap(long)] + #[arg(long)] id: String, /// Id of the gateway we are going to connect to. - #[clap(long)] + #[arg(long)] gateway: Option, /// Specifies whether the new gateway should be determined based by latency as opposed to being chosen /// uniformly. - #[clap(long, conflicts_with = "gateway")] + #[arg(long, conflicts_with = "gateway")] latency_based_selection: bool, /// Force register gateway. WARNING: this will overwrite any existing keys for the given id, /// potentially causing loss of access. - #[clap(long)] + #[arg(long)] force_register_gateway: bool, /// Comma separated list of rest endpoints of the nyxd validators - #[clap(long, alias = "nymd_validators", value_delimiter = ',')] + #[arg(long, alias = "nymd_validators", value_delimiter = ',')] nyxd_urls: Option>, /// Comma separated list of rest endpoints of the API validators - #[clap(long, alias = "api_validators", value_delimiter = ',')] + #[arg(long, alias = "api_validators", value_delimiter = ',')] // the alias here is included for backwards compatibility (1.1.4 and before) nym_apis: Option>, /// Set this client to work in a enabled credentials mode that would attempt to use gateway /// with bandwidth credential requirement. - #[clap(long)] + #[arg(long)] enabled_credentials_mode: Option, - #[clap(short, long, default_value_t = OutputFormat::default())] + #[arg(short, long, default_value_t = OutputFormat::default())] output: OutputFormat, } diff --git a/service-providers/network-requester/src/cli/mod.rs b/service-providers/network-requester/src/cli/mod.rs index 1eeed74c28..5ed966a237 100644 --- a/service-providers/network-requester/src/cli/mod.rs +++ b/service-providers/network-requester/src/cli/mod.rs @@ -36,17 +36,17 @@ fn pretty_build_info_static() -> &'static str { } #[derive(Parser)] -#[clap(author = "Nymtech", version, about, long_version = pretty_build_info_static())] +#[command(author = "Nymtech", version, about, long_version = pretty_build_info_static())] pub(crate) struct Cli { /// Path pointing to an env file that configures the client. - #[clap(short, long)] + #[arg(short, long)] pub(crate) config_env_file: Option, /// Flag used for disabling the printed banner in tty. - #[clap(long)] + #[arg(long)] pub(crate) no_banner: bool, - #[clap(subcommand)] + #[command(subcommand)] command: Commands, } diff --git a/service-providers/network-requester/src/cli/run.rs b/service-providers/network-requester/src/cli/run.rs index 6827c3ed82..4e5cee9c47 100644 --- a/service-providers/network-requester/src/cli/run.rs +++ b/service-providers/network-requester/src/cli/run.rs @@ -16,39 +16,39 @@ const ENABLE_STATISTICS: &str = "enable-statistics"; #[derive(Args, Clone)] pub(crate) struct Run { /// Id of the nym-mixnet-client we want to run. - #[clap(long)] + #[arg(long)] id: String, /// Specifies whether this network requester should run in 'open-proxy' mode - #[clap(long)] + #[arg(long)] open_proxy: bool, /// Enable service anonymized statistics that get sent to a statistics aggregator server - #[clap(long)] + #[arg(long)] enable_statistics: bool, /// Mixnet client address where a statistics aggregator is running. The default value is a Nym /// aggregator client - #[clap(long)] + #[arg(long)] statistics_recipient: Option, /// Set this client to work in a enabled credentials mode that would attempt to use gateway /// with bandwidth credential requirement. - #[clap(long)] + #[arg(long)] enabled_credentials_mode: Option, /// Mostly debug-related option to increase default traffic rate so that you would not need to /// modify config post init - #[clap(long, hide = true)] + #[arg(long, hide = true)] fastmode: bool, /// Disable loop cover traffic and the Poisson rate limiter (for debugging only) - #[clap(long, hide = true)] + #[arg(long, hide = true)] no_cover: bool, /// Enable medium mixnet traffic, for experiments only. /// This includes things like disabling cover traffic, no per hop delays, etc. - #[clap(long, hide = true)] + #[arg(long, hide = true)] medium_toggle: bool, } diff --git a/service-providers/network-requester/src/cli/sign.rs b/service-providers/network-requester/src/cli/sign.rs index 5535857a17..053a431e4b 100644 --- a/service-providers/network-requester/src/cli/sign.rs +++ b/service-providers/network-requester/src/cli/sign.rs @@ -13,14 +13,14 @@ use nym_types::helpers::ConsoleSigningOutput; #[derive(Args, Clone)] pub(crate) struct Sign { /// The id of the mixnode you want to sign with - #[clap(long)] + #[arg(long)] id: String, /// Signs a transaction-specific payload, that is going to be sent to the smart contract, with your identity key - #[clap(long)] + #[arg(long)] contract_msg: String, - #[clap(short, long, default_value_t = OutputFormat::default())] + #[arg(short, long, default_value_t = OutputFormat::default())] output: OutputFormat, }