diff --git a/substrate/client/cli/src/arg_enums.rs b/substrate/client/cli/src/arg_enums.rs index a09b7f824c..ac50413803 100644 --- a/substrate/client/cli/src/arg_enums.rs +++ b/substrate/client/cli/src/arg_enums.rs @@ -88,7 +88,7 @@ impl Into for WasmExecutionMethod { /// The default [`WasmExecutionMethod`]. #[cfg(feature = "wasmtime")] -pub const DEFAULT_WASM_EXECUTION_METHOD: &str = "Compiled"; +pub const DEFAULT_WASM_EXECUTION_METHOD: &str = "compiled"; /// The default [`WasmExecutionMethod`]. #[cfg(not(feature = "wasmtime"))] @@ -96,7 +96,7 @@ pub const DEFAULT_WASM_EXECUTION_METHOD: &str = "interpreted-i-know-what-i-do"; #[allow(missing_docs)] #[derive(Debug, Copy, Clone, PartialEq, Eq, ArgEnum)] -#[clap(rename_all = "PascalCase")] +#[clap(rename_all = "kebab-case")] pub enum TracingReceiver { /// Output the tracing records using the log. Log, @@ -112,7 +112,7 @@ impl Into for TracingReceiver { /// The type of the node key. #[derive(Debug, Copy, Clone, PartialEq, Eq, ArgEnum)] -#[clap(rename_all = "PascalCase")] +#[clap(rename_all = "kebab-case")] pub enum NodeKeyType { /// Use ed25519. Ed25519, @@ -120,7 +120,7 @@ pub enum NodeKeyType { /// The crypto scheme to use. #[derive(Debug, Copy, Clone, PartialEq, Eq, ArgEnum)] -#[clap(rename_all = "PascalCase")] +#[clap(rename_all = "kebab-case")] pub enum CryptoScheme { /// Use ed25519. Ed25519, @@ -132,7 +132,7 @@ pub enum CryptoScheme { /// The type of the output format. #[derive(Debug, Copy, Clone, PartialEq, Eq, ArgEnum)] -#[clap(rename_all = "PascalCase")] +#[clap(rename_all = "kebab-case")] pub enum OutputType { /// Output as json. Json, @@ -142,7 +142,7 @@ pub enum OutputType { /// How to execute blocks #[derive(Debug, Copy, Clone, PartialEq, Eq, ArgEnum)] -#[clap(rename_all = "PascalCase")] +#[clap(rename_all = "kebab-case")] pub enum ExecutionStrategy { /// Execute with native build (if available, WebAssembly otherwise). Native, @@ -165,22 +165,10 @@ impl Into for ExecutionStrategy { } } -impl ExecutionStrategy { - /// Returns the variant as `'&static str`. - pub fn as_str(&self) -> &'static str { - match self { - Self::Native => "Native", - Self::Wasm => "Wasm", - Self::Both => "Both", - Self::NativeElseWasm => "NativeElseWasm", - } - } -} - /// Available RPC methods. #[allow(missing_docs)] #[derive(Debug, Copy, Clone, PartialEq, ArgEnum)] -#[clap(rename_all = "PascalCase")] +#[clap(rename_all = "kebab-case")] pub enum RpcMethods { /// Expose every RPC method only when RPC is listening on `localhost`, /// otherwise serve only safe RPC methods. @@ -243,7 +231,7 @@ impl Database { /// Whether off-chain workers are enabled. #[allow(missing_docs)] #[derive(Debug, Clone, ArgEnum)] -#[clap(rename_all = "PascalCase")] +#[clap(rename_all = "kebab-case")] pub enum OffchainWorkerEnabled { /// Always have offchain worker enabled. Always, @@ -255,7 +243,7 @@ pub enum OffchainWorkerEnabled { /// Syncing mode. #[derive(Debug, Clone, Copy, ArgEnum, PartialEq)] -#[clap(rename_all = "PascalCase")] +#[clap(rename_all = "kebab-case")] pub enum SyncMode { /// Full sync. Download end verify all blocks. Full, diff --git a/substrate/client/cli/src/commands/run_cmd.rs b/substrate/client/cli/src/commands/run_cmd.rs index b9318813b0..dea1e2a6da 100644 --- a/substrate/client/cli/src/commands/run_cmd.rs +++ b/substrate/client/cli/src/commands/run_cmd.rs @@ -71,16 +71,16 @@ pub struct RunCmd { /// RPC methods to expose. /// - /// - `Unsafe`: Exposes every RPC method. - /// - `Safe`: Exposes only a safe subset of RPC methods, denying unsafe RPC methods. - /// - `Auto`: Acts as `Safe` if RPC is served externally, e.g. when `--{rpc,ws}-external` is - /// passed, otherwise acts as `Unsafe`. + /// - `unsafe`: Exposes every RPC method. + /// - `safe`: Exposes only a safe subset of RPC methods, denying unsafe RPC methods. + /// - `auto`: Acts as `safe` if RPC is served externally, e.g. when `--{rpc,ws}-external` is + /// passed, otherwise acts as `unsafe`. #[clap( long, value_name = "METHOD SET", arg_enum, ignore_case = true, - default_value = "Auto", + default_value = "auto", verbatim_doc_comment )] pub rpc_methods: RpcMethods, diff --git a/substrate/client/cli/src/params/mod.rs b/substrate/client/cli/src/params/mod.rs index 33e714ec13..9fccce606b 100644 --- a/substrate/client/cli/src/params/mod.rs +++ b/substrate/client/cli/src/params/mod.rs @@ -118,7 +118,7 @@ impl BlockNumberOrHash { #[derive(Debug, Clone, Args)] pub struct CryptoSchemeFlag { /// cryptography scheme - #[clap(long, value_name = "SCHEME", arg_enum, ignore_case = true, default_value = "Sr25519")] + #[clap(long, value_name = "SCHEME", arg_enum, ignore_case = true, default_value = "sr25519")] pub scheme: CryptoScheme, } @@ -126,7 +126,7 @@ pub struct CryptoSchemeFlag { #[derive(Debug, Clone, Args)] pub struct OutputTypeFlag { /// output format - #[clap(long, value_name = "FORMAT", arg_enum, ignore_case = true, default_value = "Text")] + #[clap(long, value_name = "FORMAT", arg_enum, ignore_case = true, default_value = "text")] pub output_type: OutputType, } diff --git a/substrate/client/cli/src/params/network_params.rs b/substrate/client/cli/src/params/network_params.rs index 7a265c5e27..ac5039fb89 100644 --- a/substrate/client/cli/src/params/network_params.rs +++ b/substrate/client/cli/src/params/network_params.rs @@ -132,12 +132,18 @@ pub struct NetworkParams { /// Blockchain syncing mode. /// - /// - `Full`: Download and validate full blockchain history. - /// - /// - `Fast`: Download blocks and the latest state only. - /// - /// - `FastUnsafe`: Same as `Fast`, but skip downloading state proofs. - #[clap(long, arg_enum, value_name = "SYNC_MODE", default_value = "Full", ignore_case(true))] + /// - `full`: Download and validate full blockchain history. + /// - `fast`: Download blocks and the latest state only. + /// - `fast-unsafe`: Same as `fast`, but skip downloading state proofs. + /// - `warp`: Download the latest state and proof. + #[clap( + long, + arg_enum, + value_name = "SYNC_MODE", + default_value = "full", + ignore_case = true, + verbatim_doc_comment + )] pub sync: SyncMode, } diff --git a/substrate/client/cli/src/params/node_key_params.rs b/substrate/client/cli/src/params/node_key_params.rs index f31fd854cb..699d0c4ece 100644 --- a/substrate/client/cli/src/params/node_key_params.rs +++ b/substrate/client/cli/src/params/node_key_params.rs @@ -66,7 +66,7 @@ pub struct NodeKeyParams { /// /// The node's secret key determines the corresponding public key and hence the /// node's peer ID in the context of libp2p. - #[clap(long, value_name = "TYPE", arg_enum, ignore_case = true, default_value = "Ed25519")] + #[clap(long, value_name = "TYPE", arg_enum, ignore_case = true, default_value = "ed25519")] pub node_key_type: NodeKeyType, /// The file from which to read the node's secret key to use for libp2p networking. diff --git a/substrate/client/cli/src/params/offchain_worker_params.rs b/substrate/client/cli/src/params/offchain_worker_params.rs index 3ab507f108..f01c75a5aa 100644 --- a/substrate/client/cli/src/params/offchain_worker_params.rs +++ b/substrate/client/cli/src/params/offchain_worker_params.rs @@ -40,7 +40,7 @@ pub struct OffchainWorkerParams { value_name = "ENABLED", arg_enum, ignore_case = true, - default_value = "WhenValidating" + default_value = "when-validating" )] pub enabled: OffchainWorkerEnabled, diff --git a/substrate/client/cli/src/params/shared_params.rs b/substrate/client/cli/src/params/shared_params.rs index 99eddf4e7c..01df2cf9ab 100644 --- a/substrate/client/cli/src/params/shared_params.rs +++ b/substrate/client/cli/src/params/shared_params.rs @@ -76,7 +76,7 @@ pub struct SharedParams { pub tracing_targets: Option, /// Receiver to process tracing messages. - #[clap(long, value_name = "RECEIVER", arg_enum, ignore_case = true, default_value = "Log")] + #[clap(long, value_name = "RECEIVER", arg_enum, ignore_case = true, default_value = "log")] pub tracing_receiver: TracingReceiver, } diff --git a/substrate/utils/frame/try-runtime/cli/src/lib.rs b/substrate/utils/frame/try-runtime/cli/src/lib.rs index ef8db7a1e5..a904725983 100644 --- a/substrate/utils/frame/try-runtime/cli/src/lib.rs +++ b/substrate/utils/frame/try-runtime/cli/src/lib.rs @@ -387,7 +387,7 @@ pub struct SharedParams { pub shared_params: sc_cli::SharedParams, /// The execution strategy that should be used. - #[clap(long, value_name = "STRATEGY", arg_enum, ignore_case = true, default_value = "Wasm")] + #[clap(long, value_name = "STRATEGY", arg_enum, ignore_case = true, default_value = "wasm")] pub execution: ExecutionStrategy, /// Type of wasm execution used.