Don't hardcode the system event

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

@@ -20,7 +20,7 @@ use frame_support_procedural_tools::syn_ext as ext;
 use frame_support_procedural_tools::{generate_crate_access, generate_hidden_includes};
 use parse::{ModuleDeclaration, RuntimeDefinition, WhereSection};
 use proc_macro::TokenStream;
-use proc_macro2::{Span, TokenStream as TokenStream2};
+use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
 use syn::{Ident, Result, TypePath};
 
@@ -68,19 +68,17 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 
 	let all_but_system_modules = modules.iter().filter(|module| module.name != SYSTEM_MODULE_NAME);
 
-	let outer_event = decl_outer_event_or_origin(
+	let outer_event = decl_outer_event(
 		&name,
-		all_but_system_modules.clone(),
-		&system_module,
+		modules.iter(),
 		&scrate,
-		DeclOuterKind::Event,
 	)?;
-	let outer_origin = decl_outer_event_or_origin(
+
+	let outer_origin = decl_outer_origin(
 		&name,
 		all_but_system_modules.clone(),
 		&system_module,
 		&scrate,
-		DeclOuterKind::Origin,
 	)?;
 	let all_modules = decl_all_modules(&name, modules.iter());
 	let module_to_index = decl_module_to_index(modules.iter(), modules.len(), &scrate);
@@ -264,32 +262,60 @@ fn decl_outer_dispatch<'a>(
 	)
 }
 
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-enum DeclOuterKind {
-	Event,
-	Origin,
+fn decl_outer_origin<'a>(
+	runtime_name: &'a Ident,
+	module_declarations: impl Iterator<Item = &'a ModuleDeclaration>,
+	system_name: &'a Ident,
+	scrate: &'a TokenStream2,
+) -> syn::Result<TokenStream2> {
+	let mut modules_tokens = TokenStream2::new();
+	for module_declaration in module_declarations {
+		match module_declaration.find_part("Origin") {
+			Some(module_entry) => {
+				let module = &module_declaration.module;
+				let instance = module_declaration.instance.as_ref();
+				let generics = &module_entry.generics;
+				if instance.is_some() && generics.params.len() == 0 {
+					let msg = format!(
+						"Instantiable module with no generic `Origin` cannot \
+						 be constructed: module `{}` must have generic `Origin`",
+						module_declaration.name
+					);
+					return Err(syn::Error::new(module_declaration.name.span(), msg));
+				}
+				let tokens = quote!(#module #instance #generics ,);
+				modules_tokens.extend(tokens);
+			}
+			None => {}
+		}
+	}
+
+	Ok(quote!(
+		#scrate::impl_outer_origin! {
+			pub enum Origin for #runtime_name where system = #system_name {
+				#modules_tokens
+			}
+		}
+	))
 }
 
-fn decl_outer_event_or_origin<'a>(
+fn decl_outer_event<'a>(
 	runtime_name: &'a Ident,
 	module_declarations: impl Iterator<Item = &'a ModuleDeclaration>,
-	system_name: &'a Ident,
 	scrate: &'a TokenStream2,
-	kind: DeclOuterKind,
 ) -> syn::Result<TokenStream2> {
 	let mut modules_tokens = TokenStream2::new();
-	let kind_str = format!("{:?}", kind);
 	for module_declaration in module_declarations {
-		match module_declaration.find_part(&kind_str) {
+		match module_declaration.find_part("Event") {
 			Some(module_entry) => {
 				let module = &module_declaration.module;
 				let instance = module_declaration.instance.as_ref();
 				let generics = &module_entry.generics;
 				if instance.is_some() && generics.params.len() == 0 {
 					let msg = format!(
-						"Instantiable module with no generic `{}` cannot \
-						 be constructed: module `{}` must have generic `{}`",
-						kind_str, module_declaration.name, kind_str
+						"Instantiable module with no generic `Event` cannot \
+						 be constructed: module `{}` must have generic `Event`",
+						module_declaration.name,
 					);
 					return Err(syn::Error::new(module_declaration.name.span(), msg));
 				}
@@ -299,14 +325,10 @@ fn decl_outer_event_or_origin<'a>(
 			None => {}
 		}
 	}
-	let macro_call = match kind {
-		DeclOuterKind::Event => quote!(#scrate::impl_outer_event!),
-		DeclOuterKind::Origin => quote!(#scrate::impl_outer_origin!),
-	};
-	let enum_name = Ident::new(kind_str.as_str(), Span::call_site());
+
 	Ok(quote!(
-		#macro_call {
-			pub enum #enum_name for #runtime_name where system = #system_name {
+		#scrate::impl_outer_event! {
+			pub enum Event for #runtime_name {
 				#modules_tokens
 			}
 		}

frame/support/src/event.rs

@@ -337,30 +337,14 @@ macro_rules! impl_outer_event {
 	(
 		$(#[$attr:meta])*
 		pub enum $name:ident for $runtime:ident {
-			$( $rest_event_without_system:tt )*
+			$( $rest_events:tt )*
 		}
 	) => {
 		$crate::impl_outer_event!(
 			$( #[$attr] )*;
 			$name;
 			$runtime;
-			system;
-			Modules { $( $rest_event_without_system )* };
-			;
-		);
-	};
-	(
-		$(#[$attr:meta])*
-		pub enum $name:ident for $runtime:ident where system = $system:ident {
-			$( $rest_event_with_system:tt )*
-		}
-	) => {
-		$crate::impl_outer_event!(
-			$( #[$attr] )*;
-			$name;
-			$runtime;
-			$system;
-			Modules { $( $rest_event_with_system )* };
+			Modules { $( $rest_events )* };
 			;
 		);
 	};
@@ -369,7 +353,6 @@ macro_rules! impl_outer_event {
 		$(#[$attr:meta])*;
 		$name:ident;
 		$runtime:ident;
-		$system:ident;
 		Modules {
 			$module:ident $instance:ident<T>,
 			$( $rest_event_generic_instance:tt )*
@@ -380,7 +363,6 @@ macro_rules! impl_outer_event {
 			$( #[$attr] )*;
 			$name;
 			$runtime;
-			$system;
 			Modules { $( $rest_event_generic_instance )* };
 			$( $module_name::Event $( <$generic_param> )? $( { $generic_instance } )?, )* $module::Event<$runtime>{ $instance },;
 		);
@@ -390,7 +372,6 @@ macro_rules! impl_outer_event {
 		$(#[$attr:meta])*;
 		$name:ident;
 		$runtime:ident;
-		$system:ident;
 		Modules {
 			$module:ident $instance:ident,
 			$( $rest_event_instance:tt )*
@@ -401,7 +382,6 @@ macro_rules! impl_outer_event {
 			$( #[$attr] )*;
 			$name;
 			$runtime;
-			$system;
 			Modules { $( $rest_event_instance )* };
 			$( $module_name::Event $( <$generic_param> )* $( { $generic_instance } )?, )* $module::Event { $instance },;
 		);
@@ -411,7 +391,6 @@ macro_rules! impl_outer_event {
 		$(#[$attr:meta])*;
 		$name:ident;
 		$runtime:ident;
-		$system:ident;
 		Modules {
 			$module:ident<T>,
 			$( $rest_event_generic:tt )*
@@ -422,7 +401,6 @@ macro_rules! impl_outer_event {
 			$( #[$attr] )*;
 			$name;
 			$runtime;
-			$system;
 			Modules { $( $rest_event_generic )* };
 			$( $module_name::Event $( <$generic_param> )? $( { $generic_instance } )?, )* $module::Event<$runtime>,;
 		);
@@ -432,7 +410,6 @@ macro_rules! impl_outer_event {
 		$(#[$attr:meta])*;
 		$name:ident;
 		$runtime:ident;
-		$system:ident;
 		Modules {
 			$module:ident,
 			$( $rest_event_no_generic_no_instance:tt )*
@@ -443,7 +420,6 @@ macro_rules! impl_outer_event {
 			$( #[$attr] )*;
 			$name;
 			$runtime;
-			$system;
 			Modules { $( $rest_event_no_generic_no_instance )* };
 			$( $module_name::Event $( <$generic_param> )? $( { $generic_instance } )?, )* $module::Event,;
 		);
@@ -454,7 +430,6 @@ macro_rules! impl_outer_event {
 		$(#[$attr:meta])*;
 		$name:ident;
 		$runtime:ident;
-		$system:ident;
 		Modules {};
 		$( $module_name:ident::Event $( <$generic_param:ident> )? $( { $generic_instance:ident } )?, )*;
 	) => {
@@ -468,18 +443,12 @@ macro_rules! impl_outer_event {
 			$(#[$attr])*
 			#[allow(non_camel_case_types)]
 			pub enum $name {
-				system($system::Event < $runtime > ),
 				$(
 					[< $module_name $(_ $generic_instance )? >](
 						$module_name::Event < $( $generic_param )? $(, $module_name::$generic_instance )? >
 					),
 				)*
 			}
-			impl From<$system::Event < $runtime >> for $name {
-				fn from(x: $system::Event < $runtime >) -> Self {
-					$name::system(x)
-				}
-			}
 			$(
 				impl From<$module_name::Event < $( $generic_param, )? $( $module_name::$generic_instance )? >> for $name {
 					fn from(x: $module_name::Event < $( $generic_param, )? $( $module_name::$generic_instance )? >) -> Self {
@@ -505,7 +474,6 @@ macro_rules! impl_outer_event {
 		$crate::__impl_outer_event_json_metadata!(
 			$runtime;
 			$name;
-			$system;
 			$(
 				$module_name::Event
 				< $( $generic_param )? $(, $module_name::$generic_instance )? >
@@ -521,7 +489,6 @@ macro_rules! __impl_outer_event_json_metadata {
 	(
 		$runtime:ident;
 		$event_name:ident;
-		$system:ident;
 		$( $module_name:ident::Event < $( $generic_params:path ),* > $( $instance:ident )?, )*;
 	) => {
 		impl $runtime {
@@ -530,22 +497,20 @@ macro_rules! __impl_outer_event_json_metadata {
 				$crate::event::OuterEventMetadata {
 					name: $crate::event::DecodeDifferent::Encode(stringify!($event_name)),
 					events: $crate::event::DecodeDifferent::Encode(&[
-						("system", $crate::event::FnEncode($system::Event::<$runtime>::metadata))
 						$(
-							, (
+							(
 								stringify!($module_name),
 								$crate::event::FnEncode(
 									$module_name::Event ::< $( $generic_params ),* > ::metadata
 								)
 							)
-						)*
+						),*
 					])
 				}
 			}
 
 			$crate::__impl_outer_event_json_metadata! {
 				@DECL_MODULE_EVENT_FNS
-				$system <$runtime> ;
 				$( $module_name < $( $generic_params ),* > $( $instance )? ; )*
 			}
 		}
@@ -717,6 +682,7 @@ mod tests {
 
 	impl_outer_event! {
 		pub enum TestEvent for TestRuntime {
+			system,
 			event_module<T>,
 			event_module2<T>,
 			event_module3,
@@ -727,7 +693,8 @@ mod tests {
 	pub struct TestRuntime2;
 
 	impl_outer_event! {
-		pub enum TestEventSystemRenamed for TestRuntime2 where system = system_renamed {
+		pub enum TestEventSystemRenamed for TestRuntime2 {
+			system_renamed,
 			event_module<T>,
 			event_module2<T>,
 			event_module3,

frame/support/src/metadata.rs

@@ -404,6 +404,7 @@ mod tests {
 
 	impl_outer_event! {
 		pub enum TestEvent for TestRuntime {
+			system,
 			event_module<T>,
 			event_module2<T>,
 		}

frame/support/test/tests/decl_error.rs

@@ -99,7 +99,7 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module, Call, Event},
+		System: system::{Module, Call, Event<T>},
 		Module1_1: module1::<Instance1>::{Module, Call, Storage},
 		Module2: module2::{Module, Call, Storage},
 		Module1_2: module1::<Instance2>::{Module, Call, Storage},

frame/support/test/tests/instance.rs

@@ -247,7 +247,7 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module, Call, Event},
+		System: system::{Module, Call, Event<T>},
 		Module1_1: module1::<Instance1>::{
 			Module, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
 		},

frame/support/test/tests/issue2219.rs

@@ -173,7 +173,7 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module, Call, Event},
+		System: system::{Module, Call, Event<T>},
 		Module: module::{Module, Call, Storage, Config},
 	}
 );