Fix --help commands

Also we can't have the banner printed all the time, because it leads to
printing malformed chain specs.

cumulus/polkadot-parachain/src/cli.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-use clap::{CommandFactory, FromArgMatches};
+use clap::{Command, CommandFactory, FromArgMatches};
 use std::path::PathBuf;
 
 /// Sub-commands supported by the collator.
@@ -62,9 +62,9 @@ pub enum Subcommand {
 #[command(
 	propagate_version = true,
 	args_conflicts_with_subcommands = true,
-	subcommand_negates_reqs = true
+	subcommand_negates_reqs = true,
+	after_help = crate::EXAMPLES
 )]
-#[clap(after_help = crate::EXAMPLES)]
 pub struct Cli {
 	#[command(subcommand)]
 	pub subcommand: Option<Subcommand>,
@@ -84,7 +84,7 @@ pub struct Cli {
 
 	/// Relay chain arguments
 	#[arg(raw = true)]
-	pub relaychain_args: Vec<String>,
+	pub relay_chain_args: Vec<String>,
 }
 
 #[derive(Debug)]
@@ -100,12 +100,25 @@ pub struct RelayChainCli {
 }
 
 impl RelayChainCli {
+	fn polkadot_cmd() -> Command {
+		let help_template = color_print::cformat!(
+			"The arguments that are passed to the relay chain node. \n\
+			\n\
+			<bold><underline>RELAY_CHAIN_ARGS:</></> \n\
+			{{options}}",
+		);
+
+		polkadot_cli::RunCmd::command()
+			.no_binary_name(true)
+			.help_template(help_template)
+	}
+
 	/// Parse the relay chain CLI parameters using the parachain `Configuration`.
 	pub fn new<'a>(
 		para_config: &sc_service::Configuration,
 		relay_chain_args: impl Iterator<Item = &'a String>,
 	) -> Self {
-		let polkadot_cmd = polkadot_cli::RunCmd::command().no_binary_name(true);
+		let polkadot_cmd = Self::polkadot_cmd();
 		let matches = polkadot_cmd.get_matches_from(relay_chain_args);
 		let base = FromArgMatches::from_arg_matches(&matches).unwrap_or_else(|e| e.exit());
 

cumulus/polkadot-parachain/src/command.rs

@@ -349,13 +349,13 @@ impl SubstrateCli for Cli {
 
 	fn description() -> String {
 		format!(
-			"{}
-The command-line arguments provided first will be passed to the parachain node, and
-the arguments provided after -- will be passed to the relay chain node.
-
-Example:
-
-{} [parachain-args] -- [relay_chain-args]",
+			"{} \n\
+			The command-line arguments provided first will be passed to the parachain node, \n\
+			and the arguments provided after -- will be passed to the relay chain node. \n\
+			\n\
+			Example: \n\
+			\n\
+			{} [parachain-args] -- [relay-chain-args]",
 			crate::BANNER,
 			Self::executable_name()
 		)
@@ -591,7 +591,7 @@ pub fn run() -> Result<()> {
 		}),
 		Some(Subcommand::PurgeChain(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
-			let polkadot_cli = RelayChainCli::new(runner.config(), cli.relaychain_args.iter());
+			let polkadot_cli = RelayChainCli::new(runner.config(), cli.relay_chain_args.iter());
 
 			runner.sync_run(|config| {
 				let polkadot_config = SubstrateCli::create_configuration(
@@ -660,7 +660,7 @@ pub fn run() -> Result<()> {
 		Some(Subcommand::Key(cmd)) => Ok(cmd.run(&cli)?),
 		None => {
 			let runner = cli.create_runner(&cli.run.normalize())?;
-			let polkadot_cli = RelayChainCli::new(runner.config(), cli.relaychain_args.iter());
+			let polkadot_cli = RelayChainCli::new(runner.config(), cli.relay_chain_args.iter());
 			let collator_options = cli.run.collator_options();
 
 			runner.run_node_until_exit(|config| async move {

cumulus/polkadot-parachain/src/main.rs

@@ -19,16 +19,15 @@
 #![warn(missing_docs)]
 #![warn(unused_extern_crates)]
 
-// TODO: help in the relay chian args should also imply this
 // TODO: ensure execution is not set to native anywhere
 
 pub(crate) const EXAMPLES: &str = color_print::cstr!(
 	r#"<bold><underline>Examples:</></>
 
    <bold>polkadot-parachain-omni-node --chain para.json --sync warp -- --chain relay.json --sync warp</>
-        Launch a warp-syncing full node of the a given para's chain-spec, and a given relay's chain-spec.
+        Launch a warp-syncing full node of a given para's chain-spec, and a given relay's chain-spec.
 
-	<green><italic>The above approach is the most flexible, and the most forward-compatible use to use the omni-node.</></>
+	<green><italic>The above approach is the most flexible, and the most forward-compatible used to spawn an omni-node.</></>
 
 	You can find the chain-spec of some networks in:
 
@@ -86,6 +85,5 @@ mod rpc;
 mod service;
 
 fn main() -> sc_cli::Result<()> {
-	println!("{}", BANNER);
 	command::run()
 }