From fbaf6133d9403b3b67c8b74294f63a0507ffe311 Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 31 Mar 2023 09:55:59 +0200 Subject: [PATCH 01/11] Add example text --- Cargo.lock | 22 ++++++++++++++++++++++ client/cli/Cargo.toml | 6 ++++++ client/cli/src/lib.rs | 10 ++++++++++ 3 files changed, 38 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index ba9fbd564c0..afe8c29f224 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1330,6 +1330,27 @@ dependencies = [ "xcm-executor", ] +[[package]] +name = "color-print" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2a5e6504ed8648554968650feecea00557a3476bc040d0ffc33080e66b646d0" +dependencies = [ + "color-print-proc-macro", +] + +[[package]] +name = "color-print-proc-macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51beaa537d73d2d1ff34ee70bc095f170420ab2ec5d687ecd3ec2b0d092514b" +dependencies = [ + "nom", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "comfy-table" version = "6.0.0" @@ -1812,6 +1833,7 @@ name = "cumulus-client-cli" version = "0.1.0" dependencies = [ "clap 4.1.13", + "color-print", "parity-scale-codec", "sc-chain-spec", "sc-cli", diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml index a363cabc02d..646c93eec95 100644 --- a/client/cli/Cargo.toml +++ b/client/cli/Cargo.toml @@ -15,3 +15,9 @@ sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "mas sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +color-print = "0.3.4" + +[features] +default = [] +example-polkadot-parachain = [] +example-parachain-template = [] diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs index edf11d72a0b..96271289fbc 100644 --- a/client/cli/src/lib.rs +++ b/client/cli/src/lib.rs @@ -275,10 +275,20 @@ fn validate_relay_chain_url(arg: &str) -> Result { )) } } +const EXAMPLE_TEXT: &str = color_print::cstr!( + r#"Examples: + --chain statemint --tmp --sync warp -- --chain polkadot + Launch a warp-syncing full node of the statemint parachain on the polkadot relay chain. + --chain statemint --tmp --sync warp --relay-chain-rpc-url ws://rpc.example.com -- --chain polkadot + Launch a full node of the statemint parachain on the polkadot relay chain. + Uses ws://rpc.example.com as remote relay chain node. +"# +); /// The `run` command used to run a node. #[derive(Debug, clap::Parser)] #[group(skip)] +#[clap(after_help = EXAMPLE_TEXT)] pub struct RunCmd { /// The cumulus RunCmd inherents from sc_cli's #[command(flatten)] From 4275fe14330ba19813a8287a3d9a3d85f5a2448c Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 31 Mar 2023 16:03:41 +0200 Subject: [PATCH 02/11] Include binary in example help text --- Cargo.lock | 3 ++- client/cli/Cargo.toml | 1 - client/cli/src/lib.rs | 10 ---------- parachain-template/node/Cargo.toml | 2 +- parachain-template/node/src/cli.rs | 13 +++++++++++++ polkadot-parachain/Cargo.toml | 24 +++--------------------- polkadot-parachain/src/cli.rs | 10 ++++++++++ 7 files changed, 29 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index afe8c29f224..2674357c992 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1833,7 +1833,6 @@ name = "cumulus-client-cli" version = "0.1.0" dependencies = [ "clap 4.1.13", - "color-print", "parity-scale-codec", "sc-chain-spec", "sc-cli", @@ -7214,6 +7213,7 @@ name = "parachain-template-node" version = "0.1.0" dependencies = [ "clap 4.1.13", + "color-print", "cumulus-client-cli", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", @@ -8473,6 +8473,7 @@ dependencies = [ "bridge-hub-rococo-runtime", "clap 4.1.13", "collectives-polkadot-runtime", + "color-print", "contracts-rococo-runtime", "cumulus-client-cli", "cumulus-client-consensus-aura", diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml index 646c93eec95..fff07a36a4e 100644 --- a/client/cli/Cargo.toml +++ b/client/cli/Cargo.toml @@ -15,7 +15,6 @@ sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "mas sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -color-print = "0.3.4" [features] default = [] diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs index 96271289fbc..edf11d72a0b 100644 --- a/client/cli/src/lib.rs +++ b/client/cli/src/lib.rs @@ -275,20 +275,10 @@ fn validate_relay_chain_url(arg: &str) -> Result { )) } } -const EXAMPLE_TEXT: &str = color_print::cstr!( - r#"Examples: - --chain statemint --tmp --sync warp -- --chain polkadot - Launch a warp-syncing full node of the statemint parachain on the polkadot relay chain. - --chain statemint --tmp --sync warp --relay-chain-rpc-url ws://rpc.example.com -- --chain polkadot - Launch a full node of the statemint parachain on the polkadot relay chain. - Uses ws://rpc.example.com as remote relay chain node. -"# -); /// The `run` command used to run a node. #[derive(Debug, clap::Parser)] #[group(skip)] -#[clap(after_help = EXAMPLE_TEXT)] pub struct RunCmd { /// The cumulus RunCmd inherents from sc_cli's #[command(flatten)] diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml index 38fe7b2ba86..3eeb2cb3e05 100644 --- a/parachain-template/node/Cargo.toml +++ b/parachain-template/node/Cargo.toml @@ -52,7 +52,7 @@ substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } # Polkadot -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master", features = ["rococo-native"] } polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } diff --git a/parachain-template/node/src/cli.rs b/parachain-template/node/src/cli.rs index 1da49b3b168..435421edb63 100644 --- a/parachain-template/node/src/cli.rs +++ b/parachain-template/node/src/cli.rs @@ -44,12 +44,25 @@ pub enum Subcommand { TryRuntime, } +const AFTER_HELP_EXAMPLE: &str = color_print::cstr!( + r#"Examples: + parachain-template-node build-spec --disable-default-bootnode > plain-parachain-chainspec.json + Export a chainspec for a local testnet in json format. + parachain-template-node --chain plain-parachain-chainspec.json --tmp -- --chain rococo-local + Launch a full node with chain specification loaded from plain-parachain-chainspec.json. + parachain-template-node + Launch a full node with default parachain local-testnet and relay chain "rococo-local". + parachain-template-node --collator + Launch a collator with default parachain local-testnet and relay chain rococo-local. + "# +); #[derive(Debug, clap::Parser)] #[command( propagate_version = true, args_conflicts_with_subcommands = true, subcommand_negates_reqs = true )] +#[clap(after_help = AFTER_HELP_EXAMPLE)] pub struct Cli { #[command(subcommand)] pub subcommand: Option, diff --git a/polkadot-parachain/Cargo.toml b/polkadot-parachain/Cargo.toml index 83920372198..4c33781e4ed 100644 --- a/polkadot-parachain/Cargo.toml +++ b/polkadot-parachain/Cargo.toml @@ -87,6 +87,7 @@ cumulus-client-service = { path = "../client/service" } cumulus-primitives-core = { path = "../primitives/core" } cumulus-primitives-parachain-inherent = { path = "../primitives/parachain-inherent" } cumulus-relay-chain-interface = { path = "../client/relay-chain-interface" } +color-print = "0.3.4" [build-dependencies] substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -102,24 +103,5 @@ polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "maste [features] default = [] -runtime-benchmarks = [ - "polkadot-service/runtime-benchmarks", - "statemint-runtime/runtime-benchmarks", - "statemine-runtime/runtime-benchmarks", - "westmint-runtime/runtime-benchmarks", - "bridge-hub-rococo-runtime/runtime-benchmarks", - "bridge-hub-kusama-runtime/runtime-benchmarks", - "bridge-hub-polkadot-runtime/runtime-benchmarks", - "collectives-polkadot-runtime/runtime-benchmarks", - "rococo-parachain-runtime/runtime-benchmarks", - "contracts-rococo-runtime/runtime-benchmarks", - "contracts-rococo-runtime/runtime-benchmarks", - "penpal-runtime/runtime-benchmarks", -] -try-runtime = [ - "statemint-runtime/try-runtime", - "statemine-runtime/try-runtime", - "westmint-runtime/try-runtime", - "shell-runtime/try-runtime", - "try-runtime-cli/try-runtime", -] +runtime-benchmarks = ["polkadot-service/runtime-benchmarks", "statemint-runtime/runtime-benchmarks", "statemine-runtime/runtime-benchmarks", "westmint-runtime/runtime-benchmarks", "bridge-hub-rococo-runtime/runtime-benchmarks", "bridge-hub-kusama-runtime/runtime-benchmarks", "bridge-hub-polkadot-runtime/runtime-benchmarks", "collectives-polkadot-runtime/runtime-benchmarks", "rococo-parachain-runtime/runtime-benchmarks", "contracts-rococo-runtime/runtime-benchmarks", "contracts-rococo-runtime/runtime-benchmarks", "penpal-runtime/runtime-benchmarks"] +try-runtime = ["statemint-runtime/try-runtime", "statemine-runtime/try-runtime", "westmint-runtime/try-runtime", "shell-runtime/try-runtime", "try-runtime-cli/try-runtime"] diff --git a/polkadot-parachain/src/cli.rs b/polkadot-parachain/src/cli.rs index 90460095a6c..5d6f7b0ea9c 100644 --- a/polkadot-parachain/src/cli.rs +++ b/polkadot-parachain/src/cli.rs @@ -64,12 +64,22 @@ pub enum Subcommand { TryRuntime, } +const AFTER_HELP_EXAMPLE: &str = color_print::cstr!( + r#"Examples: + polkadot-parachain --chain statemint --tmp --sync warp -- --chain polkadot + Launch a warp-syncing full node of the statemint parachain on the polkadot relay chain. + polkadot-parachain --chain statemint --tmp --sync warp --relay-chain-rpc-url ws://rpc.example.com -- --chain polkadot + Launch a full node of the statemint parachain on the polkadot relay chain. + Uses ws://rpc.example.com as remote relay chain node. + "# +); #[derive(Debug, clap::Parser)] #[command( propagate_version = true, args_conflicts_with_subcommands = true, subcommand_negates_reqs = true )] +#[clap(after_help = AFTER_HELP_EXAMPLE)] pub struct Cli { #[command(subcommand)] pub subcommand: Option, From 0fdf62a65b7cc3a4a34fcf71d1ebf5819aaf369c Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 31 Mar 2023 16:23:42 +0200 Subject: [PATCH 03/11] Make clippy happy --- .../src/collator_overseer.rs | 8 ++++---- client/relay-chain-minimal-node/src/lib.rs | 9 +++++---- .../src/reconnecting_ws_client.rs | 2 +- parachain-template/node/Cargo.toml | 12 +++--------- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/client/relay-chain-minimal-node/src/collator_overseer.rs b/client/relay-chain-minimal-node/src/collator_overseer.rs index dce68e3b1f6..9bcbc2a67a8 100644 --- a/client/relay-chain-minimal-node/src/collator_overseer.rs +++ b/client/relay-chain-minimal-node/src/collator_overseer.rs @@ -114,7 +114,7 @@ fn build_overseer<'a>( .collation_generation(CollationGenerationSubsystem::new(Metrics::register(registry)?)) .collator_protocol({ let side = ProtocolSide::Collator( - network_service.local_peer_id().clone(), + network_service.local_peer_id(), collator_pair, collation_req_receiver, Metrics::register(registry)?, @@ -129,8 +129,8 @@ fn build_overseer<'a>( peer_set_protocol_names.clone(), )) .network_bridge_tx(NetworkBridgeTxSubsystem::new( - network_service.clone(), - authority_discovery_service.clone(), + network_service, + authority_discovery_service, network_bridge_metrics, req_protocol_names, peer_set_protocol_names, @@ -170,7 +170,7 @@ pub(crate) fn spawn_overseer( e })?; - let overseer_handle = Handle::new(overseer_handle.clone()); + let overseer_handle = Handle::new(overseer_handle); { let handle = overseer_handle.clone(); task_manager.spawn_essential_handle().spawn_blocking( diff --git a/client/relay-chain-minimal-node/src/lib.rs b/client/relay-chain-minimal-node/src/lib.rs index c47f6d08d22..90afd31b8b6 100644 --- a/client/relay-chain-minimal-node/src/lib.rs +++ b/client/relay-chain-minimal-node/src/lib.rs @@ -69,7 +69,7 @@ fn build_authority_discovery_service( network.clone(), Box::pin(dht_event_stream), authority_discovery_role, - prometheus_registry.clone(), + prometheus_registry, ); task_manager.spawn_handle().spawn( @@ -150,9 +150,10 @@ async fn new_minimal_relay_chain( let (collation_req_receiver, available_data_req_receiver) = build_request_response_protocol_receivers(&request_protocol_names, &mut config); - let best_header = relay_chain_rpc_client.chain_get_header(None).await?.ok_or_else(|| { - RelayChainError::RpcCallError("Unable to fetch best header".to_string().into()) - })?; + let best_header = relay_chain_rpc_client + .chain_get_header(None) + .await? + .ok_or_else(|| RelayChainError::RpcCallError("Unable to fetch best header".to_string()))?; let (network, network_starter, sync_oracle) = build_collator_network(&config, task_manager.spawn_handle(), genesis_hash, best_header) .map_err(|e| RelayChainError::Application(Box::new(e) as Box<_>))?; diff --git a/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs b/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs index 05d1c23bb7a..e03525226bc 100644 --- a/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs +++ b/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs @@ -381,7 +381,7 @@ impl ReconnectingWebsocketWorker { } if client_manager.connect_to_new_rpc_server().await.is_err() { - return Err(format!("Unable to find valid external RPC server, shutting down.")) + return Err("Unable to find valid external RPC server, shutting down.".to_string()) }; for item in requests_to_retry.into_iter() { diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml index 3eeb2cb3e05..a7056051cd0 100644 --- a/parachain-template/node/Cargo.toml +++ b/parachain-template/node/Cargo.toml @@ -64,18 +64,12 @@ cumulus-client-service = { path = "../../client/service" } cumulus-primitives-core = { path = "../../primitives/core" } cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inherent" } cumulus-relay-chain-interface = { path = "../../client/relay-chain-interface" } +color-print = "0.3.4" [build-dependencies] substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] default = [] -runtime-benchmarks = [ - "try-runtime-cli/try-runtime", - "parachain-template-runtime/runtime-benchmarks", - "polkadot-cli/runtime-benchmarks", -] -try-runtime = [ - "try-runtime-cli/try-runtime", - "parachain-template-runtime/try-runtime" -] +runtime-benchmarks = ["try-runtime-cli/try-runtime", "parachain-template-runtime/runtime-benchmarks", "polkadot-cli/runtime-benchmarks"] +try-runtime = ["try-runtime-cli/try-runtime", "parachain-template-runtime/try-runtime"] From 1f7368bdbb81b5919efb721babc6d100e606b2c9 Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 31 Mar 2023 16:28:54 +0200 Subject: [PATCH 04/11] Remove unwanted changes --- client/cli/Cargo.toml | 5 ----- polkadot-parachain/Cargo.toml | 23 +++++++++++++++++++++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml index fff07a36a4e..a363cabc02d 100644 --- a/client/cli/Cargo.toml +++ b/client/cli/Cargo.toml @@ -15,8 +15,3 @@ sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "mas sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } - -[features] -default = [] -example-polkadot-parachain = [] -example-parachain-template = [] diff --git a/polkadot-parachain/Cargo.toml b/polkadot-parachain/Cargo.toml index 4c33781e4ed..dca4eb267f3 100644 --- a/polkadot-parachain/Cargo.toml +++ b/polkadot-parachain/Cargo.toml @@ -103,5 +103,24 @@ polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "maste [features] default = [] -runtime-benchmarks = ["polkadot-service/runtime-benchmarks", "statemint-runtime/runtime-benchmarks", "statemine-runtime/runtime-benchmarks", "westmint-runtime/runtime-benchmarks", "bridge-hub-rococo-runtime/runtime-benchmarks", "bridge-hub-kusama-runtime/runtime-benchmarks", "bridge-hub-polkadot-runtime/runtime-benchmarks", "collectives-polkadot-runtime/runtime-benchmarks", "rococo-parachain-runtime/runtime-benchmarks", "contracts-rococo-runtime/runtime-benchmarks", "contracts-rococo-runtime/runtime-benchmarks", "penpal-runtime/runtime-benchmarks"] -try-runtime = ["statemint-runtime/try-runtime", "statemine-runtime/try-runtime", "westmint-runtime/try-runtime", "shell-runtime/try-runtime", "try-runtime-cli/try-runtime"] +runtime-benchmarks = [ + "polkadot-service/runtime-benchmarks", + "statemint-runtime/runtime-benchmarks", + "statemine-runtime/runtime-benchmarks", + "westmint-runtime/runtime-benchmarks", + "bridge-hub-rococo-runtime/runtime-benchmarks", + "bridge-hub-kusama-runtime/runtime-benchmarks", + "bridge-hub-polkadot-runtime/runtime-benchmarks", + "collectives-polkadot-runtime/runtime-benchmarks", + "rococo-parachain-runtime/runtime-benchmarks", + "contracts-rococo-runtime/runtime-benchmarks", + "contracts-rococo-runtime/runtime-benchmarks", + "penpal-runtime/runtime-benchmarks", +] +try-runtime = [ + "statemint-runtime/try-runtime", + "statemine-runtime/try-runtime", + "westmint-runtime/try-runtime", + "shell-runtime/try-runtime", + "try-runtime-cli/try-runtime", +] From b00cc6849df2e5d5d1ef10a88cab5f081636c215 Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 31 Mar 2023 16:45:27 +0200 Subject: [PATCH 05/11] Improve formatting --- parachain-template/node/src/cli.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parachain-template/node/src/cli.rs b/parachain-template/node/src/cli.rs index 435421edb63..2e64a53e96a 100644 --- a/parachain-template/node/src/cli.rs +++ b/parachain-template/node/src/cli.rs @@ -51,7 +51,7 @@ const AFTER_HELP_EXAMPLE: &str = color_print::cstr!( parachain-template-node --chain plain-parachain-chainspec.json --tmp -- --chain rococo-local Launch a full node with chain specification loaded from plain-parachain-chainspec.json. parachain-template-node - Launch a full node with default parachain local-testnet and relay chain "rococo-local". + Launch a full node with default parachain local-testnet and relay chain rococo-local. parachain-template-node --collator Launch a collator with default parachain local-testnet and relay chain rococo-local. "# From 9b4e5d37fb5d33e6d539187a13ed62182afbc9b7 Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 31 Mar 2023 16:51:37 +0200 Subject: [PATCH 06/11] Remove `--tmp` flag --- polkadot-parachain/src/cli.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/polkadot-parachain/src/cli.rs b/polkadot-parachain/src/cli.rs index 5d6f7b0ea9c..85750d49ab8 100644 --- a/polkadot-parachain/src/cli.rs +++ b/polkadot-parachain/src/cli.rs @@ -66,9 +66,9 @@ pub enum Subcommand { const AFTER_HELP_EXAMPLE: &str = color_print::cstr!( r#"Examples: - polkadot-parachain --chain statemint --tmp --sync warp -- --chain polkadot + polkadot-parachain --chain statemint --sync warp -- --chain polkadot Launch a warp-syncing full node of the statemint parachain on the polkadot relay chain. - polkadot-parachain --chain statemint --tmp --sync warp --relay-chain-rpc-url ws://rpc.example.com -- --chain polkadot + polkadot-parachain --chain statemint --sync warp --relay-chain-rpc-url ws://rpc.example.com -- --chain polkadot Launch a full node of the statemint parachain on the polkadot relay chain. Uses ws://rpc.example.com as remote relay chain node. "# From 025e59288f79c62f2f1273485a71efb39ca282bd Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 31 Mar 2023 16:55:40 +0200 Subject: [PATCH 07/11] Unwanted changes --- parachain-template/node/Cargo.toml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml index a7056051cd0..ba026df41fc 100644 --- a/parachain-template/node/Cargo.toml +++ b/parachain-template/node/Cargo.toml @@ -71,5 +71,12 @@ substrate-build-script-utils = { git = "https://github.com/paritytech/substrate" [features] default = [] -runtime-benchmarks = ["try-runtime-cli/try-runtime", "parachain-template-runtime/runtime-benchmarks", "polkadot-cli/runtime-benchmarks"] -try-runtime = ["try-runtime-cli/try-runtime", "parachain-template-runtime/try-runtime"] +runtime-benchmarks = [ + "try-runtime-cli/try-runtime", + "parachain-template-runtime/runtime-benchmarks", + "polkadot-cli/runtime-benchmarks", +] +try-runtime = [ + "try-runtime-cli/try-runtime", + "parachain-template-runtime/try-runtime" +] From c977683c36a455f20a10de330247084444ea7634 Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 31 Mar 2023 16:58:38 +0200 Subject: [PATCH 08/11] More unwanted --- parachain-template/node/Cargo.toml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml index ba026df41fc..5c7b66fde5c 100644 --- a/parachain-template/node/Cargo.toml +++ b/parachain-template/node/Cargo.toml @@ -80,3 +80,14 @@ try-runtime = [ "try-runtime-cli/try-runtime", "parachain-template-runtime/try-runtime" ] +[features] +default = [] +runtime-benchmarks = [ + "try-runtime-cli/try-runtime", + "parachain-template-runtime/runtime-benchmarks", + "polkadot-cli/runtime-benchmarks", +] +try-runtime = [ + "try-runtime-cli/try-runtime", + "parachain-template-runtime/try-runtime" +] From fcf2dd119139f0d0a8491309867105ec195b3ad4 Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 31 Mar 2023 17:00:24 +0200 Subject: [PATCH 09/11] Confusion --- parachain-template/node/Cargo.toml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml index 5c7b66fde5c..ba026df41fc 100644 --- a/parachain-template/node/Cargo.toml +++ b/parachain-template/node/Cargo.toml @@ -80,14 +80,3 @@ try-runtime = [ "try-runtime-cli/try-runtime", "parachain-template-runtime/try-runtime" ] -[features] -default = [] -runtime-benchmarks = [ - "try-runtime-cli/try-runtime", - "parachain-template-runtime/runtime-benchmarks", - "polkadot-cli/runtime-benchmarks", -] -try-runtime = [ - "try-runtime-cli/try-runtime", - "parachain-template-runtime/try-runtime" -] From 0dabc0778ac7b5b703bbf59c22d454254be95db9 Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 31 Mar 2023 17:07:06 +0200 Subject: [PATCH 10/11] Improve wording --- polkadot-parachain/src/cli.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-parachain/src/cli.rs b/polkadot-parachain/src/cli.rs index 85750d49ab8..cae42e27f52 100644 --- a/polkadot-parachain/src/cli.rs +++ b/polkadot-parachain/src/cli.rs @@ -69,7 +69,7 @@ const AFTER_HELP_EXAMPLE: &str = color_print::cstr!( polkadot-parachain --chain statemint --sync warp -- --chain polkadot Launch a warp-syncing full node of the statemint parachain on the polkadot relay chain. polkadot-parachain --chain statemint --sync warp --relay-chain-rpc-url ws://rpc.example.com -- --chain polkadot - Launch a full node of the statemint parachain on the polkadot relay chain. + Launch a warp-syncing full node of the statemint parachain on the polkadot relay chain. Uses ws://rpc.example.com as remote relay chain node. "# ); From 9c02c7cff9d99ba70352769e59dcf7fbfd2d5668 Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 31 Mar 2023 23:02:54 +0200 Subject: [PATCH 11/11] Update polkadot-parachain/src/cli.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bastian Köcher --- polkadot-parachain/src/cli.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-parachain/src/cli.rs b/polkadot-parachain/src/cli.rs index cae42e27f52..682911abf75 100644 --- a/polkadot-parachain/src/cli.rs +++ b/polkadot-parachain/src/cli.rs @@ -66,7 +66,7 @@ pub enum Subcommand { const AFTER_HELP_EXAMPLE: &str = color_print::cstr!( r#"Examples: - polkadot-parachain --chain statemint --sync warp -- --chain polkadot + polkadot-parachain --chain statemint --sync warp -- --chain polkadot --sync warp Launch a warp-syncing full node of the statemint parachain on the polkadot relay chain. polkadot-parachain --chain statemint --sync warp --relay-chain-rpc-url ws://rpc.example.com -- --chain polkadot Launch a warp-syncing full node of the statemint parachain on the polkadot relay chain.