From 99856764eeb093cfbaeda23e59d7372b93b852f8 Mon Sep 17 00:00:00 2001
From: Gregory Hill <gregorydhill@outlook.com>
Date: Thu, 26 Aug 2021 18:57:30 +0100
Subject: [PATCH] fix: use cumulus cli run cmd

Signed-off-by: Gregory Hill <gregorydhill@outlook.com>
---
 parachain/src/cli.rs     | 26 +-------------------------
 parachain/src/command.rs | 10 ++++++----
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/parachain/src/cli.rs b/parachain/src/cli.rs
index 50d5633a5e..7f3ce439be 100644
--- a/parachain/src/cli.rs
+++ b/parachain/src/cli.rs
@@ -76,24 +76,6 @@ pub struct ExportGenesisWasmCommand {
     pub chain: Option<String>,
 }
 
-#[derive(Debug, StructOpt)]
-pub struct RunCmd {
-    #[structopt(flatten)]
-    pub base: sc_cli::RunCmd,
-
-    /// Id of the parachain this collator collates for.
-    #[structopt(long)]
-    pub parachain_id: Option<u32>,
-}
-
-impl std::ops::Deref for RunCmd {
-    type Target = sc_cli::RunCmd;
-
-    fn deref(&self) -> &Self::Target {
-        &self.base
-    }
-}
-
 #[derive(Debug, StructOpt)]
 #[structopt(settings = &[
 	structopt::clap::AppSettings::GlobalVersion,
@@ -105,13 +87,7 @@ pub struct Cli {
     pub subcommand: Option<Subcommand>,
 
     #[structopt(flatten)]
-    pub run: RunCmd,
-
-    /// Run node as collator.
-    ///
-    /// Note that this is the same as running with `--validator`.
-    #[structopt(long, conflicts_with = "validator")]
-    pub collator: bool,
+    pub run: cumulus_client_cli::RunCmd,
 
     /// Relaychain arguments
     #[structopt(raw = true)]
diff --git a/parachain/src/command.rs b/parachain/src/command.rs
index 65ddd5a877..e25a8ae848 100644
--- a/parachain/src/command.rs
+++ b/parachain/src/command.rs
@@ -91,11 +91,13 @@ impl SubstrateCli for RelayChainCli {
     }
 
     fn description() -> String {
-        "Cumulus test parachain collator\n\nThe command-line arguments provided first will be \
+        format!(
+            "Polkadot collator\n\nThe command-line arguments provided first will be \
 		passed to the parachain node, while the arguments provided after -- will be passed \
 		to the relaychain node.\n\n\
-		rococo-collator [parachain-args] -- [relaychain-args]"
-            .into()
+		{} [parachain-args] -- [relaychain-args]",
+            Self::executable_name()
+        )
     }
 
     fn author() -> String {
@@ -251,7 +253,7 @@ pub fn run() -> Result<()> {
             Ok(())
         }
         None => {
-            let runner = cli.create_runner(&*cli.run)?;
+            let runner = cli.create_runner(&cli.run.normalize())?;
 
             runner
                 .run_node_until_exit(|config| async move { start_node(cli, config).await })