Ensure pallets with different paths but same last path segment can co…

…exist

frame/support/test/tests/construct_runtime.rs

@@ -156,9 +156,46 @@ mod nested {
 	}
 }
 
+pub mod module3 {
+	use super::*;
+
+	pub trait Config: system::Config {}
+
+	frame_support::decl_module! {
+		pub struct Module<T: Config> for enum Call
+			where origin: <T as system::Config>::Origin, system=system
+		{
+			#[weight = 0]
+			pub fn fail(_origin) -> frame_support::dispatch::DispatchResult {
+				Err(Error::<T>::Something.into())
+			}
+		}
+	}
+
+	#[derive(Clone, PartialEq, Eq, Debug, codec::Encode, codec::Decode)]
+	pub struct Origin;
+
+	frame_support::decl_event! {
+		pub enum Event {
+			A,
+		}
+	}
+
+	frame_support::decl_error! {
+		pub enum Error for Module<T: Config> {
+			Something
+		}
+	}
+
+	frame_support::decl_storage! {
+		trait Store for Module<T: Config> as Module {}
+	}
+}
+
 impl<I> module1::Config<I> for Runtime {}
 impl module2::Config for Runtime {}
 impl nested::module3::Config for Runtime {}
+impl module3::Config for Runtime {}
 
 pub type Signature = sr25519::Signature;
 pub type AccountId = <Signature as Verify>::Signer;
@@ -187,7 +224,8 @@ frame_support::construct_runtime!(
 		Module1_1: module1::<Instance1>::{Pallet, Call, Storage, Event<T>, Origin<T>},
 		Module2: module2::{Pallet, Call, Storage, Event, Origin},
 		Module1_2: module1::<Instance2>::{Pallet, Call, Storage, Event<T>, Origin<T>},
-		Module3: nested::module3::{Pallet, Call, Storage, Event, Origin},
+		NestedModule3: nested::module3::{Pallet, Call, Storage, Event, Origin},
+		Module3: module3::{Pallet, Call, Storage, Event, Origin},
 		Module1_3: module1::<Instance3>::{Pallet, Storage} = 6,
 		Module1_4: module1::<Instance4>::{Pallet, Call} = 3,
 		Module1_5: module1::<Instance5>::{Pallet, Event<T>},
@@ -217,7 +255,7 @@ fn check_modules_error_type() {
 		Err(DispatchError::Module { index: 33, error: 0, message: Some("Something") }),
 	);
 	assert_eq!(
-		Module3::fail(system::Origin::<Runtime>::Root.into()),
+		NestedModule3::fail(system::Origin::<Runtime>::Root.into()),
 		Err(DispatchError::Module { index: 34, error: 0, message: Some("Something") }),
 	);
 	assert_eq!(
@@ -275,6 +313,9 @@ fn origin_codec() {
 	let origin = OriginCaller::nested_module3(nested::module3::Origin);
 	assert_eq!(origin.encode()[0], 34);
 
+	let origin = OriginCaller::module3(module3::Origin);
+	assert_eq!(origin.encode()[0], 35);
+
 	let origin = OriginCaller::module1_Instance6(module1::Origin(Default::default()));
 	assert_eq!(origin.encode()[0], 1);
 
@@ -307,6 +348,9 @@ fn event_codec() {
 	let event = nested::module3::Event::A;
 	assert_eq!(Event::from(event).encode()[0], 34);
 
+	let event = module3::Event::A;
+	assert_eq!(Event::from(event).encode()[0], 35);
+
 	let event = module1::Event::<Runtime, module1::Instance5>::A(Default::default());
 	assert_eq!(Event::from(event).encode()[0], 4);
 
@@ -330,7 +374,8 @@ fn call_codec() {
 	assert_eq!(Call::Module1_1(module1::Call::fail()).encode()[0], 31);
 	assert_eq!(Call::Module2(module2::Call::fail()).encode()[0], 32);
 	assert_eq!(Call::Module1_2(module1::Call::fail()).encode()[0], 33);
-	assert_eq!(Call::Module3(nested::module3::Call::fail()).encode()[0], 34);
+	assert_eq!(Call::NestedModule3(nested::module3::Call::fail()).encode()[0], 34);
+	assert_eq!(Call::Module3(module3::Call::fail()).encode()[0], 35);
 	assert_eq!(Call::Module1_4(module1::Call::fail()).encode()[0], 3);
 	assert_eq!(Call::Module1_6(module1::Call::fail()).encode()[0], 1);
 	assert_eq!(Call::Module1_7(module1::Call::fail()).encode()[0], 2);
@@ -439,7 +484,7 @@ fn test_metadata() {
 				index: 33,
 			},
 			ModuleMetadata {
-				name: DecodeDifferent::Encode("Module3"),
+				name: DecodeDifferent::Encode("NestedModule3"),
 				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
 					prefix: DecodeDifferent::Encode("Module"),
 					entries: DecodeDifferent::Encode(&[]),
@@ -462,6 +507,30 @@ fn test_metadata() {
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 34,
 			},
+			ModuleMetadata {
+				name: DecodeDifferent::Encode("Module3"),
+				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
+					prefix: DecodeDifferent::Encode("Module"),
+					entries: DecodeDifferent::Encode(&[]),
+				}))),
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[
+					FunctionMetadata {
+						name: DecodeDifferent::Encode("fail"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					},
+				]))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| &[
+					EventMetadata {
+						name: DecodeDifferent::Encode("A"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					},
+				]))),
+				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
+				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
+				index: 35,
+			},
 			ModuleMetadata {
 				name: DecodeDifferent::Encode("Module1_3"),
 				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
@@ -603,7 +672,10 @@ fn pallet_in_runtime_is_correct() {
 	assert_eq!(PalletInfo::index::<Module1_2>().unwrap(), 33);
 	assert_eq!(PalletInfo::name::<Module1_2>().unwrap(), "Module1_2");
 
-	assert_eq!(PalletInfo::index::<Module3>().unwrap(), 34);
+	assert_eq!(PalletInfo::index::<NestedModule3>().unwrap(), 34);
+	assert_eq!(PalletInfo::name::<NestedModule3>().unwrap(), "NestedModule3");
+
+	assert_eq!(PalletInfo::index::<Module3>().unwrap(), 35);
 	assert_eq!(PalletInfo::name::<Module3>().unwrap(), "Module3");
 
 	assert_eq!(PalletInfo::index::<Module1_3>().unwrap(), 6);