Part of paritytech/cumulus#963

darwinia-network · May 30, 2022 · 47408c1 · 47408c1
1 parent 002d15b
commit 47408c1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/src/cli.rs b/src/cli.rs
@@ -115,7 +115,7 @@ pub struct Cli {
 	pub run: cumulus_client_cli::RunCmd,
 
 	/// Relay chain arguments
-	#[clap(raw = true)]
+	#[clap(raw = true, conflicts_with = "relay-chain-rpc-url")]
 	pub relay_chain_args: Vec<String>,
 }
 

diff --git a/src/command.rs b/src/command.rs
@@ -246,7 +246,6 @@ pub fn run() -> Result<()> {
 			let para_id = Extensions::try_get(&*config.chain_spec)
 				.map(|e| e.para_id)
 				.ok_or_else(|| "Could not find parachain ID in chain-spec.")?;
-
 			let polkadot_cli = RelayChainCli::new(
 				&config,
 				[RelayChainCli::executable_name().to_string()]

diff --git a/src/service/mod.rs b/src/service/mod.rs
@@ -450,9 +450,7 @@ where
 			params.keystore_container.sync_keystore(),
 			force_authoring,
 		)?;
-
 		let spawner = task_manager.spawn_handle();
-
 		let params = StartCollatorParams {
 			para_id: id,
 			block_status: client.clone(),