pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 04:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update clap to version 4 (#1745)

Browse Source 
* Bump to clap4

* Adjust to clap 4 style

* Remove two more deprecated occurences of clap macro

* Remove "deprecated" feature from clap

* Update cargo lock

* Fix group name

* More skipped group names
This commit is contained in:
Sebastian Kunert
2022-10-18 13:30:22 +02:00
committed by GitHub
parent 8cb818687d
commit 975403e802
9 changed files with 465 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/Cargo.lock
Generated
+421 -709
View File
File diff suppressed because it is too large Load Diff
cumulus/client/cli/Cargo.toml
+1 -1
View File
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021" edition = "2021"
[dependencies] [dependencies]
clap = { version = "3.2.22", features = ["derive", "deprecated"] } clap = { version = "4.0.9", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0" } codec = { package = "parity-scale-codec", version = "3.0.0" }
url = "2.3.1" url = "2.3.1"
cumulus/client/cli/src/lib.rs
+14 -12
View File
@@ -40,17 +40,18 @@ use url::Url;
/// The `purge-chain` command used to remove the whole chain: the parachain and the relay chain. /// The `purge-chain` command used to remove the whole chain: the parachain and the relay chain.
#[derive(Debug, clap::Parser)] #[derive(Debug, clap::Parser)]
#[group(skip)]
pub struct PurgeChainCmd { pub struct PurgeChainCmd {
/// The base struct of the purge-chain command. /// The base struct of the purge-chain command.
#[clap(flatten)] #[command(flatten)]
pub base: sc_cli::PurgeChainCmd, pub base: sc_cli::PurgeChainCmd,
/// Only delete the para chain database /// Only delete the para chain database
#[clap(long, aliases = &["para"])] #[arg(long, aliases = &["para"])]
pub parachain: bool, pub parachain: bool,
/// Only delete the relay chain database /// Only delete the relay chain database
#[clap(long, aliases = &["relay"])] #[arg(long, aliases = &["relay"])]
pub relaychain: bool, pub relaychain: bool,
} }
@@ -131,15 +132,15 @@ impl sc_cli::CliConfiguration for PurgeChainCmd {
#[derive(Debug, clap::Parser)] #[derive(Debug, clap::Parser)]
pub struct ExportGenesisStateCommand { pub struct ExportGenesisStateCommand {
/// Output file name or stdout if unspecified. /// Output file name or stdout if unspecified.
#[clap(action)] #[arg()]
pub output: Option<PathBuf>, pub output: Option<PathBuf>,
/// Write output in binary. Default is to write in hex. /// Write output in binary. Default is to write in hex.
#[clap(short, long)] #[arg(short, long)]
pub raw: bool, pub raw: bool,
#[allow(missing_docs)] #[allow(missing_docs)]
#[clap(flatten)] #[command(flatten)]
pub shared_params: sc_cli::SharedParams, pub shared_params: sc_cli::SharedParams,
} }
@@ -214,15 +215,15 @@ impl sc_cli::CliConfiguration for ExportGenesisStateCommand {
#[derive(Debug, clap::Parser)] #[derive(Debug, clap::Parser)]
pub struct ExportGenesisWasmCommand { pub struct ExportGenesisWasmCommand {
/// Output file name or stdout if unspecified. /// Output file name or stdout if unspecified.
#[clap(action)] #[arg()]
pub output: Option<PathBuf>, pub output: Option<PathBuf>,
/// Write output in binary. Default is to write in hex. /// Write output in binary. Default is to write in hex.
#[clap(short, long)] #[arg(short, long)]
pub raw: bool, pub raw: bool,
#[allow(missing_docs)] #[allow(missing_docs)]
#[clap(flatten)] #[command(flatten)]
pub shared_params: sc_cli::SharedParams, pub shared_params: sc_cli::SharedParams,
} }
@@ -277,19 +278,20 @@ fn validate_relay_chain_url(arg: &str) -> Result<Url, String> {
/// The `run` command used to run a node. /// The `run` command used to run a node.
#[derive(Debug, clap::Parser)] #[derive(Debug, clap::Parser)]
#[group(skip)]
pub struct RunCmd { pub struct RunCmd {
/// The cumulus RunCmd inherents from sc_cli's /// The cumulus RunCmd inherents from sc_cli's
#[clap(flatten)] #[command(flatten)]
pub base: sc_cli::RunCmd, pub base: sc_cli::RunCmd,
/// Run node as collator. /// Run node as collator.
/// ///
/// Note that this is the same as running with `--validator`. /// Note that this is the same as running with `--validator`.
#[clap(long, conflicts_with = "validator")] #[arg(long, conflicts_with = "validator")]
pub collator: bool, pub collator: bool,
/// EXPERIMENTAL: Specify an URL to a relay chain full node to communicate with. /// EXPERIMENTAL: Specify an URL to a relay chain full node to communicate with.
#[clap( #[arg(
long, long,
value_parser = validate_relay_chain_url value_parser = validate_relay_chain_url
)] )]
cumulus/parachain-template/node/Cargo.toml
+1 -1
View File
@@ -10,7 +10,7 @@ edition = "2021"
build = "build.rs" build = "build.rs"
[dependencies] [dependencies]
clap = { version = "3.2.22", features = ["derive"] } clap = { version = "4.0.9", features = ["derive"] }
log = "0.4.17" log = "0.4.17"
codec = { package = "parity-scale-codec", version = "3.0.0" } codec = { package = "parity-scale-codec", version = "3.0.0" }
serde = { version = "1.0.145", features = ["derive"] } serde = { version = "1.0.145", features = ["derive"] }
cumulus/parachain-template/node/src/cli.rs
+6 -6
View File
@@ -32,7 +32,7 @@ pub enum Subcommand {
/// Sub-commands concerned with benchmarking. /// Sub-commands concerned with benchmarking.
/// The pallet benchmarking moved to the `pallet` sub-command. /// The pallet benchmarking moved to the `pallet` sub-command.
#[clap(subcommand)] #[command(subcommand)]
Benchmark(frame_benchmarking_cli::BenchmarkCmd), Benchmark(frame_benchmarking_cli::BenchmarkCmd),
/// Try some testing command against a specified runtime state. /// Try some testing command against a specified runtime state.
@@ -40,16 +40,16 @@ pub enum Subcommand {
} }
#[derive(Debug, clap::Parser)] #[derive(Debug, clap::Parser)]
#[clap( #[command(
propagate_version = true, propagate_version = true,
args_conflicts_with_subcommands = true, args_conflicts_with_subcommands = true,
subcommand_negates_reqs = true subcommand_negates_reqs = true
)] )]
pub struct Cli { pub struct Cli {
#[clap(subcommand)] #[command(subcommand)]
pub subcommand: Option<Subcommand>, pub subcommand: Option<Subcommand>,
#[clap(flatten)] #[command(flatten)]
pub run: cumulus_client_cli::RunCmd, pub run: cumulus_client_cli::RunCmd,
/// Disable automatic hardware benchmarks. /// Disable automatic hardware benchmarks.
@@ -59,11 +59,11 @@ pub struct Cli {
/// ///
/// The results are then printed out in the logs, and also sent as part of /// The results are then printed out in the logs, and also sent as part of
/// telemetry, if telemetry is enabled. /// telemetry, if telemetry is enabled.
#[clap(long)] #[arg(long)]
pub no_hardware_benchmarks: bool, pub no_hardware_benchmarks: bool,
/// Relay chain arguments /// Relay chain arguments
#[clap(raw = true)] #[arg(raw = true)]
pub relay_chain_args: Vec<String>, pub relay_chain_args: Vec<String>,
} }
cumulus/polkadot-parachain/Cargo.toml
+1 -1
View File
@@ -8,7 +8,7 @@ description = "Runs a polkadot parachain node which could be a collator."
[dependencies] [dependencies]
async-trait = "0.1.57" async-trait = "0.1.57"
clap = { version = "3.2.22", features = ["derive", "deprecated"] } clap = { version = "4.0.9", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0" } codec = { package = "parity-scale-codec", version = "3.0.0" }
futures = "0.3.24" futures = "0.3.24"
hex-literal = "0.3.4" hex-literal = "0.3.4"
cumulus/polkadot-parachain/src/cli.rs
+7 -7
View File
@@ -20,7 +20,7 @@ use std::path::PathBuf;
#[derive(Debug, clap::Subcommand)] #[derive(Debug, clap::Subcommand)]
pub enum Subcommand { pub enum Subcommand {
/// Key management CLI utilities /// Key management CLI utilities
#[clap(subcommand)] #[command(subcommand)]
Key(sc_cli::KeySubcommand), Key(sc_cli::KeySubcommand),
/// Build a chain specification. /// Build a chain specification.
@@ -52,7 +52,7 @@ pub enum Subcommand {
/// Sub-commands concerned with benchmarking. /// Sub-commands concerned with benchmarking.
/// The pallet benchmarking moved to the `pallet` sub-command. /// The pallet benchmarking moved to the `pallet` sub-command.
#[clap(subcommand)] #[command(subcommand)]
Benchmark(frame_benchmarking_cli::BenchmarkCmd), Benchmark(frame_benchmarking_cli::BenchmarkCmd),
/// Try some testing command against a specified runtime state. /// Try some testing command against a specified runtime state.
@@ -60,16 +60,16 @@ pub enum Subcommand {
} }
#[derive(Debug, clap::Parser)] #[derive(Debug, clap::Parser)]
#[clap( #[command(
propagate_version = true, propagate_version = true,
args_conflicts_with_subcommands = true, args_conflicts_with_subcommands = true,
subcommand_negates_reqs = true subcommand_negates_reqs = true
)] )]
pub struct Cli { pub struct Cli {
#[clap(subcommand)] #[command(subcommand)]
pub subcommand: Option<Subcommand>, pub subcommand: Option<Subcommand>,
#[clap(flatten)] #[command(flatten)]
pub run: cumulus_client_cli::RunCmd, pub run: cumulus_client_cli::RunCmd,
/// Disable automatic hardware benchmarks. /// Disable automatic hardware benchmarks.
@@ -79,11 +79,11 @@ pub struct Cli {
/// ///
/// The results are then printed out in the logs, and also sent as part of /// The results are then printed out in the logs, and also sent as part of
/// telemetry, if telemetry is enabled. /// telemetry, if telemetry is enabled.
#[clap(long)] #[arg(long)]
pub no_hardware_benchmarks: bool, pub no_hardware_benchmarks: bool,
/// Relay chain arguments /// Relay chain arguments
#[clap(raw = true)] #[arg(raw = true)]
pub relaychain_args: Vec<String>, pub relaychain_args: Vec<String>,
} }
cumulus/test/service/Cargo.toml
+1 -1
View File
@@ -10,7 +10,7 @@ path = "src/main.rs"
[dependencies] [dependencies]
async-trait = "0.1.57" async-trait = "0.1.57"
clap = { version = "3.2.22", features = ["derive", "deprecated"] } clap = { version = "4.0.9", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0" } codec = { package = "parity-scale-codec", version = "3.0.0" }
criterion = { version = "0.4.0", features = [ "async_tokio" ] } criterion = { version = "0.4.0", features = [ "async_tokio" ] }
jsonrpsee = { version = "0.15.1", features = ["server"] } jsonrpsee = { version = "0.15.1", features = ["server"] }
cumulus/test/service/src/cli.rs
+13 -11
View File
@@ -24,30 +24,30 @@ use sc_cli::{
use sc_service::BasePath; use sc_service::BasePath;
#[derive(Debug, clap::Parser)] #[derive(Debug, clap::Parser)]
#[clap( #[command(
version, version,
propagate_version = true, propagate_version = true,
args_conflicts_with_subcommands = true, args_conflicts_with_subcommands = true,
subcommand_negates_reqs = true subcommand_negates_reqs = true
)] )]
pub struct TestCollatorCli { pub struct TestCollatorCli {
#[clap(subcommand)] #[command(subcommand)]
pub subcommand: Option<Subcommand>, pub subcommand: Option<Subcommand>,
#[clap(flatten)] #[command(flatten)]
pub run: cumulus_client_cli::RunCmd, pub run: cumulus_client_cli::RunCmd,
#[clap(default_value_t = 2000u32)] #[arg(default_value_t = 2000u32)]
pub parachain_id: u32, pub parachain_id: u32,
/// Relay chain arguments /// Relay chain arguments
#[clap(raw = true)] #[arg(raw = true)]
pub relaychain_args: Vec<String>, pub relaychain_args: Vec<String>,
#[clap(long)] #[arg(long)]
pub use_null_consensus: bool, pub use_null_consensus: bool,
#[clap(long)] #[arg(long)]
pub disable_block_announcements: bool, pub disable_block_announcements: bool,
} }
@@ -64,11 +64,12 @@ pub enum Subcommand {
} }
#[derive(Debug, clap::Parser)] #[derive(Debug, clap::Parser)]
#[group(skip)]
pub struct ExportGenesisStateCommand { pub struct ExportGenesisStateCommand {
#[clap(default_value_t = 2000u32)] #[arg(default_value_t = 2000u32)]
pub parachain_id: u32, pub parachain_id: u32,
#[clap(flatten)] #[command(flatten)]
pub base: cumulus_client_cli::ExportGenesisStateCommand, pub base: cumulus_client_cli::ExportGenesisStateCommand,
} }
@@ -80,11 +81,12 @@ impl CliConfiguration for ExportGenesisStateCommand {
/// Command for exporting the genesis wasm file. /// Command for exporting the genesis wasm file.
#[derive(Debug, clap::Parser)] #[derive(Debug, clap::Parser)]
#[group(skip)]
pub struct ExportGenesisWasmCommand { pub struct ExportGenesisWasmCommand {
#[clap(default_value_t = 2000u32)] #[arg(default_value_t = 2000u32)]
pub parachain_id: u32, pub parachain_id: u32,
#[clap(flatten)] #[command(flatten)]
pub base: cumulus_client_cli::ExportGenesisWasmCommand, pub base: cumulus_client_cli::ExportGenesisWasmCommand,
} }