Composite accounts (#4820)

* Basic account composition. * Add try_mutate_exists * De-duplicate * Refactor away the UpdateBalanceOutcome * Expunge final UpdateBalanceOutcome refs * Refactor transfer * Refactor reservable currency stuff. * Test with the alternative setup. * Fixes * Test with both setups. * Fixes * Fix * Fix macros * Make indices opt-in * Remove CreationFee, and make indices opt-in. * Fix construct_runtime * Fix last few bits * Fix tests * Update trait impls * Don't hardcode the system event * Make tests build and fix some stuff. * Pointlessly bump runtime version * Fix benchmark * Another fix * Whitespace * Make indices module economically safe * Migrations for indices. * Fix * Whilespace * Trim defunct migrations * Remove unused storage item * More contains_key fixes * Docs. * Bump runtime * Remove unneeded code * Fix test * Fix test * Update frame/balances/src/lib.rs Co-Authored-By: Shawn Tabrizi <shawntabrizi@gmail.com> * Fix ED logic * Repatriate reserved logic * Typo * Fix typo * Update frame/system/src/lib.rs Co-Authored-By: Shawn Tabrizi <shawntabrizi@gmail.com> * Update frame/system/src/lib.rs Co-Authored-By: Shawn Tabrizi <shawntabrizi@gmail.com> * Last few fixes * Another fix * Build fix Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> Co-authored-by: Jaco Greeff <jacogr@gmail.com> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
2026-04-27 10:27:59 +00:00 · 2020-02-14 00:47:51 +00:00
parent d3fa8c91af
commit 5b7512e2e4
79 changed files with 2459 additions and 2100 deletions
@@ -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),
 				$(
 					[< $module_name $(_ $generic_instance )? >](
 						$module_name::Event < $( $generic_param )? $(, $module_name::$generic_instance )? >
 					),
 				)*
 			}
-			impl From<$system::Event> for $name {
-				fn from(x: $system::Event) -> 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::metadata))
 						$(
-							, (
+							(
 								stringify!($module_name),
 								$crate::event::FnEncode(
 									$module_name::Event ::< $( $generic_params ),* > ::metadata
 								)
 							)
-						)*
+						),*
 					])
 				}
 			}

 			$crate::__impl_outer_event_json_metadata! {
 				@DECL_MODULE_EVENT_FNS
-				$system <> ;
 				$( $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,