fix format changes

Author: girazoki

node/src/chain_spec.rs

@@ -262,30 +262,41 @@ mod tests {
 	use super::*;
 	#[test]
 	fn test_derived_pairs_1() {
-		let mnemonic = "bottom drive obey lake curtain smoke basket hold race lonely fit walk".to_string();
+		let mnemonic =
+			"bottom drive obey lake curtain smoke basket hold race lonely fit walk".to_string();
 		let accounts = 10;
 		let pairs = derive_bip44_pairs_from_mnemonic::<ecdsa::Public>(&mnemonic, accounts);
-		let first_account = get_account_id_from_pair::<ecdsa::Public>(pairs.first().unwrap().clone()).unwrap();
-		let last_account = get_account_id_from_pair::<ecdsa::Public>(pairs.last().unwrap().clone()).unwrap();
+		let first_account =
+			get_account_id_from_pair::<ecdsa::Public>(pairs.first().unwrap().clone()).unwrap();
+		let last_account =
+			get_account_id_from_pair::<ecdsa::Public>(pairs.last().unwrap().clone()).unwrap();
 
-		let expected_first_account = AccountId::from_str("f24FF3a9CF04c71Dbc94D0b566f7A27B94566cac").unwrap();
-		let expected_last_account = AccountId::from_str("2898FE7a42Be376C8BC7AF536A940F7Fd5aDd423").unwrap();
+		let expected_first_account =
+			AccountId::from_str("f24FF3a9CF04c71Dbc94D0b566f7A27B94566cac").unwrap();
+		let expected_last_account =
+			AccountId::from_str("2898FE7a42Be376C8BC7AF536A940F7Fd5aDd423").unwrap();
 		assert_eq!(first_account, expected_first_account);
 		assert_eq!(last_account, expected_last_account);
 		assert_eq!(pairs.len(), 10);
 	}
 	#[test]
 	fn test_derived_pairs_2() {
-		let mnemonic = "slab nerve salon plastic filter inherit valve ozone crash thumb quality whale".to_string();
+		let mnemonic =
+			"slab nerve salon plastic filter inherit valve ozone crash thumb quality whale"
+				.to_string();
 		let accounts = 20;
 		let pairs = derive_bip44_pairs_from_mnemonic::<ecdsa::Public>(&mnemonic, accounts);
-		let first_account = get_account_id_from_pair::<ecdsa::Public>(pairs.first().unwrap().clone()).unwrap();
-		let last_account = get_account_id_from_pair::<ecdsa::Public>(pairs.last().unwrap().clone()).unwrap();
+		let first_account =
+			get_account_id_from_pair::<ecdsa::Public>(pairs.first().unwrap().clone()).unwrap();
+		let last_account =
+			get_account_id_from_pair::<ecdsa::Public>(pairs.last().unwrap().clone()).unwrap();
 
-		let expected_first_account = AccountId::from_str("1e56ca71b596f2b784a27a2fdffef053dbdeff83").unwrap();
-		let expected_last_account = AccountId::from_str("4148202BF0c0Ad7697Cff87EbB83340C80c947f8").unwrap();
+		let expected_first_account =
+			AccountId::from_str("1e56ca71b596f2b784a27a2fdffef053dbdeff83").unwrap();
+		let expected_last_account =
+			AccountId::from_str("4148202BF0c0Ad7697Cff87EbB83340C80c947f8").unwrap();
 		assert_eq!(first_account, expected_first_account);
 		assert_eq!(last_account, expected_last_account);
 		assert_eq!(pairs.len(), 20);
 	}
-}
+}

node/src/cli.rs

@@ -18,6 +18,8 @@ use sp_core::H160;
 use std::path::PathBuf;
 use std::str::FromStr;
 use structopt::StructOpt;
+
+/// Sub-commands supported by the collator.
 #[derive(Debug, StructOpt)]
 pub enum Subcommand {
 	/// Export the genesis state of the parachain.
@@ -56,11 +58,13 @@ pub struct BuildSpecCommand {
 	pub base: sc_cli::BuildSpecCmd,
 
 	/// Number of accounts to be funded in the genesis
-	#[structopt(long)]
+	/// Warning: This flag implies a development spec and overrides any explicitly supplied spec
+	#[structopt(long, conflicts_with = "chain")]
 	pub accounts: Option<u32>,
 
 	/// Mnemonic from which we can derive funded accounts in the genesis
-	#[structopt(long)]
+	/// Warning: This flag implies a development spec and overrides any explicitly supplied spec
+	#[structopt(long, conflicts_with = "chain")]
 	pub mnemonic: Option<String>,
 }
 

node/src/command.rs

@@ -41,20 +41,14 @@ fn load_spec(
 	id: &str,
 	para_id: ParaId,
 ) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
-
 	match id {
 		"alphanet" => Ok(Box::new(chain_spec::ChainSpec::from_json_bytes(
 			&include_bytes!("../../specs/alphanet/parachain-embedded-specs-v6.json")[..],
 		)?)),
 		"stagenet" => Ok(Box::new(chain_spec::ChainSpec::from_json_bytes(
 			&include_bytes!("../../specs/stagenet/parachain-embedded-specs-v6.json")[..],
 		)?)),
-		"dev" | "development" =>  {
-			Ok(Box::new(chain_spec::development_chain_spec(
-				None,
-				None,
-			)))
-		},
+		"dev" | "development" => Ok(Box::new(chain_spec::development_chain_spec(None, None))),
 		"local" => Ok(Box::new(chain_spec::get_chain_spec(para_id))),
 		"" => Err(
 			"You have not specified what chain to sync. In the future, this will default to \
@@ -99,10 +93,7 @@ impl SubstrateCli for Cli {
 	}
 
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
-		load_spec(
-			id,
-			self.run.parachain_id.unwrap_or(1000).into(),
-		)
+		load_spec(id, self.run.parachain_id.unwrap_or(1000).into())
 	}
 
 	fn native_runtime_version(_: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
@@ -178,10 +169,13 @@ pub fn run() -> Result<()> {
 			runner.sync_run(|config| {
 				if params.mnemonic.is_some() || params.accounts.is_some() {
 					params.base.run(
-						Box::new(chain_spec::development_chain_spec(params.mnemonic.clone(), params.accounts)),
-						config.network)
-				}
-				else {
+						Box::new(chain_spec::development_chain_spec(
+							params.mnemonic.clone(),
+							params.accounts,
+						)),
+						config.network,
+					)
+				} else {
 					params.base.run(config.chain_spec, config.network)
 				}
 			})