remove magic number

cumulus/parachains/integration-tests/emulated/common/src/lib.rs

@@ -114,7 +114,7 @@ pub mod accounts {
 	pub const DUMMY_EMPTY: &str = "JohnDoe";
 
 	pub fn init_balances() -> Vec<AccountId> {
-		Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect()
+		Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect()
 	}
 }
 

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/genesis_config_presets.rs

@@ -113,7 +113,7 @@ pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
 				(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
 				(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
 			],
-			Sr25519Keyring::iter().take(12).map(|x| x.to_account_id()).collect(),
+			Sr25519Keyring::well_known().map(|x| x.to_account_id()).collect(),
 			testnet_parachains_constants::rococo::currency::UNITS * 1_000_000,
 			1000.into(),
 		),

cumulus/parachains/runtimes/assets/asset-hub-westend/src/genesis_config_presets.rs

@@ -111,7 +111,7 @@ pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
 				(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
 				(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
 			],
-			Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect(),
+			Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 			WND * 1_000_000,
 			1000.into(),
 		),

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/genesis_config_presets.rs

@@ -96,7 +96,7 @@ pub fn get_preset(id: &sp_genesis_builder::PresetId) -> Option<sp_std::vec::Vec<
 				(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
 				(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
 			],
-			Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect(),
+			Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 			1013.into(),
 			Some(Sr25519Keyring::Bob.to_account_id()),
 			rococo_runtime_constants::system_parachain::ASSET_HUB_ID.into(),
@@ -112,7 +112,7 @@ pub fn get_preset(id: &sp_genesis_builder::PresetId) -> Option<sp_std::vec::Vec<
 				(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
 				(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
 			],
-			Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect(),
+			Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 			1013.into(),
 			Some(Sr25519Keyring::Bob.to_account_id()),
 			rococo_runtime_constants::system_parachain::ASSET_HUB_ID.into(),

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/genesis_config_presets.rs

@@ -96,7 +96,7 @@ pub fn get_preset(id: &sp_genesis_builder::PresetId) -> Option<sp_std::vec::Vec<
 				(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
 				(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
 			],
-			Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect(),
+			Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 			1002.into(),
 			Some(Sr25519Keyring::Bob.to_account_id()),
 			westend_runtime_constants::system_parachain::ASSET_HUB_ID.into(),
@@ -112,7 +112,7 @@ pub fn get_preset(id: &sp_genesis_builder::PresetId) -> Option<sp_std::vec::Vec<
 				(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
 				(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
 			],
-			Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect(),
+			Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 			1002.into(),
 			Some(Sr25519Keyring::Bob.to_account_id()),
 			westend_runtime_constants::system_parachain::ASSET_HUB_ID.into(),

cumulus/parachains/runtimes/collectives/collectives-westend/src/genesis_config_presets.rs

@@ -76,7 +76,7 @@ pub fn get_preset(id: &sp_genesis_builder::PresetId) -> Option<sp_std::vec::Vec<
 				(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
 				(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
 			],
-			Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect(),
+			Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 			1001.into(),
 		),
 		Ok(sp_genesis_builder::DEV_RUNTIME_PRESET) => collectives_westend_genesis(

cumulus/polkadot-parachain/src/chain_spec/penpal.rs

@@ -44,7 +44,7 @@ pub fn get_penpal_chain_spec(id: ParaId, relay_chain: &str) -> GenericChainSpec
 			(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
 			(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
 		],
-		Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect(),
+		Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 		id,
 	))
 	.build()

cumulus/polkadot-parachain/src/chain_spec/people.rs

@@ -156,7 +156,7 @@ pub mod rococo {
 				(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
 				(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
 			],
-			Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect(),
+			Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 			para_id,
 		))
 		.with_properties(properties)
@@ -245,7 +245,7 @@ pub mod westend {
 				(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
 				(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
 			],
-			Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect(),
+			Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 			para_id,
 		))
 		.with_properties(properties)

cumulus/polkadot-parachain/src/chain_spec/rococo_parachain.rs

@@ -40,7 +40,7 @@ pub fn rococo_parachain_local_config() -> GenericChainSpec {
 			AuraId::from(Sr25519Keyring::Alice.public()),
 			AuraId::from(Sr25519Keyring::Bob.public()),
 		],
-		Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect(),
+		Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 		1000.into(),
 	))
 	.build()

cumulus/test/service/src/chain_spec.rs

@@ -88,11 +88,10 @@ pub fn testnet_genesis_with_default_endowed(
 	mut extra_endowed_accounts: Vec<AccountId>,
 	self_para_id: Option<ParaId>,
 ) -> serde_json::Value {
-	let mut endowed =
-		Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect::<Vec<_>>();
+	let mut endowed = Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect::<Vec<_>>();
 	endowed.append(&mut extra_endowed_accounts);
 	let invulnerables =
-		Sr25519Keyring::iter().take(6).map(|k| k.public().into()).collect::<Vec<_>>();
+		Sr25519Keyring::invulnerable().map(|k| k.public().into()).collect::<Vec<_>>();
 	testnet_genesis(Sr25519Keyring::Alice.to_account_id(), invulnerables, endowed, self_para_id)
 }
 

polkadot/node/test/service/src/chain_spec.rs

@@ -86,7 +86,7 @@ fn get_authority_keys_from_seed(
 }
 
 fn testnet_accounts() -> Vec<AccountId> {
-	Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect()
+	Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect()
 }
 
 /// Helper function to create polkadot `RuntimeGenesisConfig` for testing

polkadot/runtime/rococo/src/genesis_config_presets.rs

@@ -75,7 +75,7 @@ fn get_authority_keys_from_seed_no_beefy(
 }
 
 fn testnet_accounts() -> Vec<AccountId> {
-	Sr25519Keyring::iter().take(12).map(|x| x.to_account_id()).collect()
+	Sr25519Keyring::well_known().map(|x| x.to_account_id()).collect()
 }
 
 fn rococo_session_keys(

polkadot/runtime/westend/src/genesis_config_presets.rs

@@ -77,7 +77,7 @@ fn get_authority_keys_from_seed_no_beefy(
 }
 
 fn testnet_accounts() -> Vec<AccountId> {
-	Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect()
+	Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect()
 }
 
 fn westend_session_keys(

substrate/bin/node/cli/src/chain_spec.rs

@@ -292,7 +292,7 @@ fn configure_accounts(
 	Vec<(AccountId, AccountId, Balance, StakerStatus<AccountId>)>,
 ) {
 	let mut endowed_accounts: Vec<AccountId> = endowed_accounts
-		.unwrap_or_else(|| Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect());
+		.unwrap_or_else(|| Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect());
 	// endow all authorities and nominators.
 	initial_authorities
 		.iter()

substrate/bin/node/testing/src/keyring.rs

@@ -57,6 +57,10 @@ pub fn ferdie() -> AccountId {
 }
 
 /// Convert keyrings into `SessionKeys`.
+///
+/// # Panics
+///
+/// Function will panic when invalid string is provided.
 pub fn session_keys_from_seed(seed: &str) -> SessionKeys {
 	SessionKeys {
 		grandpa: get_public_from_string_or_panic::<ed25519::Public>(seed).into(),

substrate/primitives/keyring/src/ed25519.rs

@@ -107,6 +107,14 @@ impl Keyring {
 	pub fn to_seed(self) -> String {
 		format!("//{}", self)
 	}
+
+	pub fn well_known() -> impl Iterator<Item = Keyring> {
+		Self::iter().take(12)
+	}
+
+	pub fn invulnerable() -> impl Iterator<Item = Keyring> {
+		Self::iter().take(6)
+	}
 }
 
 impl From<Keyring> for &'static str {
@@ -147,12 +155,12 @@ impl FromStr for Keyring {
 			"Dave" | "dave" => Ok(Keyring::Dave),
 			"Eve" | "eve" => Ok(Keyring::Eve),
 			"Ferdie" | "ferdie" => Ok(Keyring::Ferdie),
-			"Alice//stash" => Ok(Keyring::AliceStash),
-			"Bob//stash" => Ok(Keyring::BobStash),
-			"Charlie//stash" => Ok(Keyring::CharlieStash),
-			"Dave//stash" => Ok(Keyring::DaveStash),
-			"Eve//stash" => Ok(Keyring::EveStash),
-			"Ferdie//stash" => Ok(Keyring::FerdieStash),
+			"Alice//stash" | "alice//stash" => Ok(Keyring::AliceStash),
+			"Bob//stash" | "bob//stash" => Ok(Keyring::BobStash),
+			"Charlie//stash" | "charlie//stash" => Ok(Keyring::CharlieStash),
+			"Dave//stash" | "dave//stash" => Ok(Keyring::DaveStash),
+			"Eve//stash" | "eve//stash" => Ok(Keyring::EveStash),
+			"Ferdie//stash" | "ferdie//stash" => Ok(Keyring::FerdieStash),
 			"One" | "one" => Ok(Keyring::One),
 			"Two" | "two" => Ok(Keyring::Two),
 			_ => Err(ParseKeyringError),
@@ -247,4 +255,40 @@ mod tests {
 	fn verify_static_public_keys() {
 		assert!(Keyring::iter().all(|k| { k.pair().public().as_ref() == <[u8; 32]>::from(k) }));
 	}
+
+	#[test]
+	fn verfity_well_known() {
+		assert_eq!(
+			Keyring::well_known().collect::<Vec<Keyring>>(),
+			vec![
+				Keyring::Alice,
+				Keyring::Bob,
+				Keyring::Charlie,
+				Keyring::Dave,
+				Keyring::Eve,
+				Keyring::Ferdie,
+				Keyring::AliceStash,
+				Keyring::BobStash,
+				Keyring::CharlieStash,
+				Keyring::DaveStash,
+				Keyring::EveStash,
+				Keyring::FerdieStash
+			]
+		);
+	}
+
+	#[test]
+	fn verify_invulnerable() {
+		assert_eq!(
+			Keyring::invulnerable().collect::<Vec<Keyring>>(),
+			vec![
+				Keyring::Alice,
+				Keyring::Bob,
+				Keyring::Charlie,
+				Keyring::Dave,
+				Keyring::Eve,
+				Keyring::Ferdie
+			]
+		);
+	}
 }

substrate/primitives/keyring/src/sr25519.rs

@@ -118,6 +118,14 @@ impl Keyring {
 	pub fn numeric_id(idx: usize) -> AccountId32 {
 		(*Self::numeric(idx).public().as_array_ref()).into()
 	}
+
+	pub fn well_known() -> impl Iterator<Item = Keyring> {
+		Self::iter().take(12)
+	}
+
+	pub fn invulnerable() -> impl Iterator<Item = Keyring> {
+		Self::iter().take(6)
+	}
 }
 
 impl From<Keyring> for &'static str {
@@ -158,12 +166,12 @@ impl FromStr for Keyring {
 			"Dave" | "dave" => Ok(Keyring::Dave),
 			"Eve" | "eve" => Ok(Keyring::Eve),
 			"Ferdie" | "ferdie" => Ok(Keyring::Ferdie),
-			"Alice//stash" => Ok(Keyring::AliceStash),
-			"Bob//stash" => Ok(Keyring::BobStash),
-			"Charlie//stash" => Ok(Keyring::CharlieStash),
-			"Dave//stash" => Ok(Keyring::DaveStash),
-			"Eve//stash" => Ok(Keyring::EveStash),
-			"Ferdie//stash" => Ok(Keyring::FerdieStash),
+			"Alice//stash" | "alice//stash" => Ok(Keyring::AliceStash),
+			"Bob//stash" | "bob//stash" => Ok(Keyring::BobStash),
+			"Charlie//stash" | "charlie//stash" => Ok(Keyring::CharlieStash),
+			"Dave//stash" | "dave//stash" => Ok(Keyring::DaveStash),
+			"Eve//stash" | "eve//stash" => Ok(Keyring::EveStash),
+			"Ferdie//stash" | "ferdie//stash" => Ok(Keyring::FerdieStash),
 			"One" | "one" => Ok(Keyring::One),
 			"Two" | "two" => Ok(Keyring::Two),
 			_ => Err(ParseKeyringError),
@@ -253,8 +261,45 @@ mod tests {
 			&Keyring::Bob.public(),
 		));
 	}
+
 	#[test]
 	fn verify_static_public_keys() {
 		assert!(Keyring::iter().all(|k| { k.pair().public().as_ref() == <[u8; 32]>::from(k) }));
 	}
+
+	#[test]
+	fn verfity_well_known() {
+		assert_eq!(
+			Keyring::well_known().collect::<Vec<Keyring>>(),
+			vec![
+				Keyring::Alice,
+				Keyring::Bob,
+				Keyring::Charlie,
+				Keyring::Dave,
+				Keyring::Eve,
+				Keyring::Ferdie,
+				Keyring::AliceStash,
+				Keyring::BobStash,
+				Keyring::CharlieStash,
+				Keyring::DaveStash,
+				Keyring::EveStash,
+				Keyring::FerdieStash
+			]
+		);
+	}
+
+	#[test]
+	fn verify_invulnerable() {
+		assert_eq!(
+			Keyring::invulnerable().collect::<Vec<Keyring>>(),
+			vec![
+				Keyring::Alice,
+				Keyring::Bob,
+				Keyring::Charlie,
+				Keyring::Dave,
+				Keyring::Eve,
+				Keyring::Ferdie
+			]
+		);
+	}
 }

templates/parachain/runtime/src/genesis_config_presets.rs

@@ -74,7 +74,7 @@ fn local_testnet_genesis() -> Value {
 			(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
 			(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
 		],
-		Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect(),
+		Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 		Sr25519Keyring::Alice.to_account_id(),
 		1000.into(),
 	)
@@ -87,7 +87,7 @@ fn development_config_genesis() -> Value {
 			(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
 			(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
 		],
-		Sr25519Keyring::iter().take(12).map(|k| k.to_account_id()).collect(),
+		Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 		Sr25519Keyring::Alice.to_account_id(),
 		1000.into(),
 	)