Merge pull request #243 from gregdhill/fix/cumulus-cli

fix: use cumulus cli run cmd

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)]

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 })