Rename ModuleToIndex to PalletRuntimeSetup (#7148)

* Rename `ModuleToIndex` to `PalletRuntimeSetup`

Besides the renaming it also adds support getting the name of a pallet
as configured in the runtime.

* Rename it to `PalletInfo`

* Remove accidentally added files

substrate/bin/node-template/pallets/template/src/mock.rs

@@ -42,7 +42,7 @@ impl system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/bin/node-template/runtime/src/lib.rs

@@ -181,7 +181,7 @@ impl frame_system::Trait for Runtime {
 	/// Converts a module to the index of the module in `construct_runtime!`.
 	///
 	/// This type is being generated by `construct_runtime!`.
-	type ModuleToIndex = ModuleToIndex;
+	type PalletInfo = PalletInfo;
 	/// What to do if a new account is created.
 	type OnNewAccount = ();
 	/// What to do if an account is fully reaped from the system.

substrate/bin/node/runtime/src/lib.rs

@@ -179,7 +179,7 @@ impl frame_system::Trait for Runtime {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = Version;
-	type ModuleToIndex = ModuleToIndex;
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/assets/src/lib.rs

@@ -319,7 +319,7 @@ mod tests {
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type MaximumBlockLength = MaximumBlockLength;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/atomic-swap/src/tests.rs

@@ -45,7 +45,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/aura/src/mock.rs

@@ -66,7 +66,7 @@ impl frame_system::Trait for Test {
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type MaximumBlockLength = MaximumBlockLength;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/authority-discovery/src/lib.rs

@@ -164,7 +164,7 @@ mod tests {
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type MaximumBlockLength = MaximumBlockLength;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/authorship/src/lib.rs

@@ -438,7 +438,7 @@ mod tests {
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type MaximumBlockLength = MaximumBlockLength;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/babe/src/mock.rs

@@ -86,7 +86,7 @@ impl frame_system::Trait for Test {
 	type MaximumExtrinsicWeight = MaximumBlockWeight;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type MaximumBlockLength = MaximumBlockLength;
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u128>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/balances/src/lib.rs

@@ -902,7 +902,7 @@ impl<T: Subtrait<I>, I: Instance> frame_system::Trait for ElevatedTrait<T, I> {
 	type MaximumBlockLength = T::MaximumBlockLength;
 	type AvailableBlockRatio = T::AvailableBlockRatio;
 	type Version = T::Version;
-	type ModuleToIndex = T::ModuleToIndex;
+	type PalletInfo = T::PalletInfo;
 	type OnNewAccount = T::OnNewAccount;
 	type OnKilledAccount = T::OnKilledAccount;
 	type AccountData = T::AccountData;

substrate/frame/balances/src/tests_composite.rs

@@ -87,7 +87,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = super::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/balances/src/tests_local.rs

@@ -87,7 +87,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = super::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = Module<Test>;

substrate/frame/benchmarking/src/tests.rs

@@ -93,7 +93,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = ();
 	type AvailableBlockRatio = ();
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/collective/src/lib.rs

@@ -985,7 +985,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/contracts/src/tests.rs

@@ -137,7 +137,7 @@ impl frame_system::Trait for Test {
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type MaximumBlockLength = MaximumBlockLength;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/democracy/src/tests.rs

@@ -112,7 +112,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/elections-phragmen/src/lib.rs

@@ -1113,7 +1113,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/elections/src/mock.rs

@@ -59,7 +59,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/evm/src/tests.rs

@@ -52,7 +52,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/example-offchain-worker/src/tests.rs

@@ -74,7 +74,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/example/src/lib.rs

@@ -764,7 +764,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/executive/src/lib.rs

@@ -591,7 +591,7 @@ mod tests {
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type MaximumBlockLength = MaximumBlockLength;
 		type Version = RuntimeVersion;
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<Balance>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/finality-tracker/src/lib.rs

@@ -273,7 +273,7 @@ mod tests {
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type MaximumBlockLength = MaximumBlockLength;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/grandpa/src/mock.rs

@@ -100,7 +100,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u128>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/identity/src/tests.rs

@@ -63,7 +63,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/im-online/src/mock.rs

@@ -130,7 +130,7 @@ impl frame_system::Trait for Runtime {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/indices/src/mock.rs

@@ -70,7 +70,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/membership/src/lib.rs

@@ -320,7 +320,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/multisig/src/tests.rs

@@ -80,7 +80,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/nicks/src/lib.rs

@@ -283,7 +283,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/node-authorization/src/lib.rs

@@ -474,7 +474,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/offences/benchmarking/src/mock.rs

@@ -59,7 +59,7 @@ impl frame_system::Trait for Test {
 	type AvailableBlockRatio = ();
 	type MaximumBlockLength = ();
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = (Balances,);

substrate/frame/offences/src/mock.rs

@@ -116,7 +116,7 @@ impl frame_system::Trait for Runtime {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/proxy/src/tests.rs

@@ -82,7 +82,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/randomness-collective-flip/src/lib.rs

@@ -178,7 +178,7 @@ mod tests {
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type MaximumBlockLength = MaximumBlockLength;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/recovery/src/mock.rs

@@ -79,7 +79,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u128>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/scheduler/src/lib.rs

@@ -735,7 +735,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/scored-pool/src/mock.rs

@@ -70,7 +70,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/session/benchmarking/src/mock.rs

@@ -78,7 +78,7 @@ impl frame_system::Trait for Test {
 	type AvailableBlockRatio = ();
 	type MaximumBlockLength = ();
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = Balances;

substrate/frame/session/src/mock.rs

@@ -193,7 +193,7 @@ impl frame_system::Trait for Test {
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type MaximumBlockLength = MaximumBlockLength;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/society/src/mock.rs

@@ -81,7 +81,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type AccountData = pallet_balances::AccountData<u64>;

substrate/frame/staking/fuzzer/src/mock.rs

@@ -77,7 +77,7 @@ impl frame_system::Trait for Test {
 	type AvailableBlockRatio = ();
 	type MaximumBlockLength = ();
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = (Balances,);

substrate/frame/staking/src/mock.rs

@@ -220,7 +220,7 @@ impl frame_system::Trait for Test {
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type MaximumBlockLength = MaximumBlockLength;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/sudo/src/mock.rs

@@ -139,7 +139,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/support/procedural/src/construct_runtime/mod.rs

@@ -52,6 +52,8 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 		..
 	} = definition;
 
+	let modules = modules.into_pairs().map(|v| v.into_value()).collect::<Vec<_>>();
+
 	// Assert we have system module declared
 	let system_module = match find_system_module(modules.iter()) {
 		Some(sm) => sm,
@@ -82,7 +84,7 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 		&scrate,
 	)?;
 	let all_modules = decl_all_modules(&name, modules.iter());
-	let module_to_index = decl_module_to_index(modules.iter(), modules.len(), &scrate);
+	let module_to_index = decl_pallet_runtime_setup(&modules, &scrate);
 
 	let dispatch = decl_outer_dispatch(&name, modules.iter(), &scrate);
 	let metadata = decl_runtime_metadata(&name, modules.iter(), &scrate, &unchecked_extrinsic);
@@ -376,22 +378,23 @@ fn decl_all_modules<'a>(
 	)
 }
 
-fn decl_module_to_index<'a>(
-	module_declarations: impl Iterator<Item = &'a ModuleDeclaration>,
-	num_modules: usize,
+fn decl_pallet_runtime_setup(
+	module_declarations: &[ModuleDeclaration],
 	scrate: &TokenStream2,
 ) -> TokenStream2 {
-	let names = module_declarations.map(|d| &d.name);
-	let indices = 0..num_modules;
+	let names = module_declarations.iter().map(|d| &d.name);
+	let names2 = module_declarations.iter().map(|d| &d.name);
+	let name_strings = module_declarations.iter().map(|d| d.name.to_string());
+	let indices = 0..module_declarations.len();
 
 	quote!(
-		/// Provides an implementation of `ModuleToIndex` to map a module
-		/// to its index in the runtime.
-		pub struct ModuleToIndex;
+		/// Provides an implementation of `PalletInfo` to provide information
+		/// about the pallet setup in the runtime.
+		pub struct PalletInfo;
 
-		impl #scrate::traits::ModuleToIndex for ModuleToIndex {
-			fn module_to_index<M: 'static>() -> Option<usize> {
-				let type_id = #scrate::sp_std::any::TypeId::of::<M>();
+		impl #scrate::traits::PalletInfo for PalletInfo {
+			fn index<P: 'static>() -> Option<usize> {
+				let type_id = #scrate::sp_std::any::TypeId::of::<P>();
 				#(
 					if type_id == #scrate::sp_std::any::TypeId::of::<#names>() {
 						return Some(#indices)
@@ -400,6 +403,17 @@ fn decl_module_to_index<'a>(
 
 				None
 			}
+
+			fn name<P: 'static>() -> Option<&'static str> {
+				let type_id = #scrate::sp_std::any::TypeId::of::<P>();
+				#(
+					if type_id == #scrate::sp_std::any::TypeId::of::<#names2>() {
+						return Some(#name_strings)
+					}
+				)*
+
+				None
+			}
 		}
 	)
 }

substrate/frame/support/src/error.rs

@@ -140,8 +140,8 @@ macro_rules! decl_error {
 			for $crate::sp_runtime::DispatchError
 		{
 			fn from(err: $error<$generic $(, $inst_generic)?>) -> Self {
-				let index = <$generic::ModuleToIndex as $crate::traits::ModuleToIndex>
-					::module_to_index::<$module<$generic $(, $inst_generic)?>>()
+				let index = <$generic::PalletInfo as $crate::traits::PalletInfo>
+					::index::<$module<$generic $(, $inst_generic)?>>()
 					.expect("Every active module has an index in the runtime; qed") as u8;
 
 				$crate::sp_runtime::DispatchError::Module {

substrate/frame/support/src/metadata.rs

@@ -297,7 +297,7 @@ mod tests {
 			type AccountId: From<u32> + Encode;
 			type BlockNumber: From<u32> + Encode;
 			type SomeValue: Get<u32>;
-			type ModuleToIndex: crate::traits::ModuleToIndex;
+			type PalletInfo: crate::traits::PalletInfo;
 			type Call;
 		}
 
@@ -443,7 +443,7 @@ mod tests {
 		type AccountId = u32;
 		type BlockNumber = u32;
 		type SomeValue = SystemValue;
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type Call = Call;
 	}
 

substrate/frame/support/src/traits.rs

@@ -1313,8 +1313,6 @@ impl<T: Clone + Ord> ChangeMembers<T> for () {
 	fn set_prime(_: Option<T>) {}
 }
 
-
-
 /// Trait for type that can handle the initialization of account IDs at genesis.
 pub trait InitializeMembers<AccountId> {
 	/// Initialize the members to the given `members`.
@@ -1380,16 +1378,20 @@ pub trait ValidatorRegistration<ValidatorId> {
 	fn is_registered(id: &ValidatorId) -> bool;
 }
 
-/// Something that can convert a given module into the index of the module in the runtime.
+/// Provides information about the pallet setup in the runtime.
 ///
-/// The index of a module is determined by the position it appears in `construct_runtime!`.
-pub trait ModuleToIndex {
-	/// Convert the given module `M` into an index.
-	fn module_to_index<M: 'static>() -> Option<usize>;
+/// An implementor should be able to provide information about each pallet that
+/// is configured in `construct_runtime!`.
+pub trait PalletInfo {
+	/// Convert the given pallet `P` into its index as configured in the runtime.
+	fn index<P: 'static>() -> Option<usize>;
+	/// Convert the given pallet `P` into its name as configured in the runtime.
+	fn name<P: 'static>() -> Option<&'static str>;
 }
 
-impl ModuleToIndex for () {
-	fn module_to_index<M: 'static>() -> Option<usize> { Some(0) }
+impl PalletInfo for () {
+	fn index<P: 'static>() -> Option<usize> { Some(0) }
+	fn name<P: 'static>() -> Option<&'static str> { Some("test") }
 }
 
 /// The function and pallet name of the Call.

substrate/frame/support/test/tests/construct_runtime.rs

@@ -24,13 +24,14 @@
 use sp_runtime::{generic, traits::{BlakeTwo256, Block as _, Verify}, DispatchError};
 use sp_core::{H256, sr25519};
 use sp_std::cell::RefCell;
+use frame_support::traits::PalletInfo as _;
 
 mod system;
 
 pub trait Currency {}
 
 thread_local! {
-    pub static INTEGRITY_TEST_EXEC: RefCell<u32> = RefCell::new(0);
+	pub static INTEGRITY_TEST_EXEC: RefCell<u32> = RefCell::new(0);
 }
 
 mod module1 {
@@ -107,7 +108,7 @@ impl system::Trait for Runtime {
 	type BlockNumber = BlockNumber;
 	type AccountId = AccountId;
 	type Event = Event;
-	type ModuleToIndex = ModuleToIndex;
+	type PalletInfo = PalletInfo;
 	type Call = Call;
 }
 
@@ -157,3 +158,15 @@ fn integrity_test_works() {
 	__construct_runtime_integrity_test::runtime_integrity_tests();
 	assert_eq!(INTEGRITY_TEST_EXEC.with(|i| *i.borrow()), 1);
 }
+
+#[test]
+fn pallet_in_runtime_is_correct() {
+	assert_eq!(PalletInfo::index::<System>().unwrap(), 0);
+	assert_eq!(PalletInfo::name::<System>().unwrap(), "System");
+
+	assert_eq!(PalletInfo::index::<Module1_2>().unwrap(), 3);
+	assert_eq!(PalletInfo::name::<Module1_2>().unwrap(), "Module1_2");
+
+	assert_eq!(PalletInfo::index::<Module2>().unwrap(), 2);
+	assert_eq!(PalletInfo::name::<Module2>().unwrap(), "Module2");
+}

substrate/frame/support/test/tests/instance.rs

@@ -241,7 +241,7 @@ impl system::Trait for Runtime {
 	type BlockNumber = BlockNumber;
 	type AccountId = AccountId;
 	type Event = Event;
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type Call = Call;
 }
 

substrate/frame/support/test/tests/issue2219.rs

@@ -164,7 +164,7 @@ impl system::Trait for Runtime {
 	type BlockNumber = BlockNumber;
 	type AccountId = AccountId;
 	type Event = Event;
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type Call = Call;
 }
 

substrate/frame/support/test/tests/system.rs

@@ -27,7 +27,7 @@ pub trait Trait: 'static + Eq + Clone {
 	type AccountId: Encode + EncodeLike + Decode;
 	type Call;
 	type Event: From<Event<Self>>;
-	type ModuleToIndex: frame_support::traits::ModuleToIndex;
+	type PalletInfo: frame_support::traits::PalletInfo;
 }
 
 frame_support::decl_module! {

substrate/frame/system/benches/bench.rs

@@ -81,7 +81,7 @@ impl system::Trait for Runtime {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/system/benchmarking/src/mock.rs

@@ -71,7 +71,7 @@ impl frame_system::Trait for Test {
 	type AvailableBlockRatio = ();
 	type MaximumBlockLength = ();
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/system/src/lib.rs

@@ -117,7 +117,7 @@ use frame_support::{
 	decl_module, decl_event, decl_storage, decl_error, Parameter, ensure, debug,
 	storage,
 	traits::{
-		Contains, Get, ModuleToIndex, OnNewAccount, OnKilledAccount, IsDeadAccount, Happened,
+		Contains, Get, PalletInfo, OnNewAccount, OnKilledAccount, IsDeadAccount, Happened,
 		StoredMap, EnsureOrigin, OriginTrait, Filter,
 	},
 	weights::{
@@ -256,11 +256,13 @@ pub trait Trait: 'static + Eq + Clone {
 	/// Get the chain's current version.
 	type Version: Get<RuntimeVersion>;
 
-	/// Convert a module to its index in the runtime.
+	/// Provides information about the pallet setup in the runtime.
 	///
-	/// Expects the `ModuleToIndex` type that is being generated by `construct_runtime!` in the
-	/// runtime. For tests it is okay to use `()` as type (returns `0` for each input).
-	type ModuleToIndex: ModuleToIndex;
+	/// Expects the `PalletInfo` type that is being generated by `construct_runtime!` in the
+	/// runtime.
+	///
+	/// For tests it is okay to use `()` as type, however it will provide "useless" data.
+	type PalletInfo: PalletInfo;
 
 	/// Data to be associated with an account (other than nonce/transaction counter, which this
 	/// module does regardless).

substrate/frame/system/src/mock.rs

@@ -101,7 +101,7 @@ impl Trait for Test {
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type MaximumBlockLength = MaximumBlockLength;
 	type Version = Version;
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = u32;
 	type OnNewAccount = ();
 	type OnKilledAccount = RecordKilled;

substrate/frame/timestamp/src/lib.rs

@@ -339,7 +339,7 @@ mod tests {
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type MaximumBlockLength = MaximumBlockLength;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/transaction-payment/src/lib.rs

@@ -654,7 +654,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/frame/treasury/src/tests.rs

@@ -80,7 +80,7 @@ impl frame_system::Trait for Test {
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type MaximumBlockLength = MaximumBlockLength;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/utility/src/tests.rs

@@ -79,7 +79,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

substrate/frame/vesting/src/lib.rs

@@ -444,7 +444,7 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
-		type ModuleToIndex = ();
+		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();

substrate/test-utils/runtime/src/lib.rs

@@ -453,7 +453,7 @@ impl frame_system::Trait for Runtime {
 	type MaximumBlockLength = MaximumBlockLength;
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
-	type ModuleToIndex = ();
+	type PalletInfo = ();
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();