From 2f50ef55d35a3aa14abf185b2bd1c49f7f8ca12e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 1 Oct 2019 17:00:22 +0200
Subject: [PATCH] Let `construct_runtime!` generate `ALL_MODULES` as nested
 tuples (#3732)

So, instead of:
`type ALL_MODULES = (Module1, Module2, Module3)`;
Generate it like this:
`type ALL_MODULES = ((Module1, Module2), Module3,);`

This should make `construct_runtime!` support an "unlimited" number of
modules.
---
 substrate/srml/sudo/src/lib.rs        |  2 +-
 substrate/srml/support/src/runtime.rs | 30 ++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/substrate/srml/sudo/src/lib.rs b/substrate/srml/sudo/src/lib.rs
index 2a733ccb2e..c4e13eefe2 100644
--- a/substrate/srml/sudo/src/lib.rs
+++ b/substrate/srml/sudo/src/lib.rs
@@ -90,7 +90,7 @@ use rstd::prelude::*;
 use sr_primitives::{
 	traits::{StaticLookup, Dispatchable}, weights::SimpleDispatchInfo, DispatchError,
 };
-use support::{StorageValue, Parameter, decl_module, decl_event, decl_storage, ensure};
+use support::{Parameter, decl_module, decl_event, decl_storage, ensure};
 use system::ensure_signed;
 
 pub trait Trait: system::Trait {
diff --git a/substrate/srml/support/src/runtime.rs b/substrate/srml/support/src/runtime.rs
index 6c5eccb125..491252ce70 100644
--- a/substrate/srml/support/src/runtime.rs
+++ b/substrate/srml/support/src/runtime.rs
@@ -220,6 +220,7 @@ macro_rules! construct_runtime {
 			$runtime;
 			;
 			{};
+			{};
 			$(
 				$name: $module:: $( < $module_instance >:: )? { $( $modules ),* },
 			)*
@@ -434,6 +435,7 @@ macro_rules! __decl_all_modules {
 		$runtime:ident;
 		;
 		{ $( $parsed:tt )* };
+		{ $( $parsed_nested:tt )* };
 		System: $module:ident::{ Module $(, $modules:ident )* },
 		$( $rest:tt )*
 	) => {
@@ -441,6 +443,7 @@ macro_rules! __decl_all_modules {
 			$runtime;
 			$module;
 			{ $( $parsed )* };
+			{ $( $parsed_nested )* };
 			$( $rest )*
 		);
 	};
@@ -448,6 +451,7 @@ macro_rules! __decl_all_modules {
 		$runtime:ident;
 		$( $system:ident )?;
 		{ $( $parsed:tt )* };
+		{};
 		$name:ident: $module:ident:: $( < $module_instance:ident >:: )? { Module $(, $modules:ident )* },
 		$( $rest:tt )*
 	) => {
@@ -458,6 +462,7 @@ macro_rules! __decl_all_modules {
 				$( $parsed )*
 				$module::$name $(<$module_instance>)?,
 			};
+			{ $name };
 			$( $rest )*
 		);
 	};
@@ -465,6 +470,26 @@ macro_rules! __decl_all_modules {
 		$runtime:ident;
 		$( $system:ident )?;
 		{ $( $parsed:tt )* };
+		{ $( $parsed_nested:tt )* };
+		$name:ident: $module:ident:: $( < $module_instance:ident >:: )? { Module $(, $modules:ident )* },
+		$( $rest:tt )*
+	) => {
+		$crate::__decl_all_modules!(
+			$runtime;
+			$( $system )?;
+			{
+				$( $parsed )*
+				$module::$name $(<$module_instance>)?,
+			};
+			{ ( $( $parsed_nested )*, $name, ) };
+			$( $rest )*
+		);
+	};
+	(
+		$runtime:ident;
+		$( $system:ident )?;
+		{ $( $parsed:tt )* };
+		{ $( $parsed_nested:tt )* };
 		$name:ident: $module:ident:: $( < $module_instance:ident >:: )? { $ignore:ident $(, $modules:ident )* },
 		$( $rest:tt )*
 	) => {
@@ -472,6 +497,7 @@ macro_rules! __decl_all_modules {
 			$runtime;
 			$( $system )?;
 			{ $( $parsed )* };
+			{ $( $parsed_nested )* };
 			$name: $module::{ $( $modules ),* },
 			$( $rest )*
 		);
@@ -487,6 +513,7 @@ macro_rules! __decl_all_modules {
 			$runtime;
 			$( $system )?;
 			{ $( $parsed )* };
+			{ $( $parsed_nested )* };
 			$( $rest )*
 		);
 	};
@@ -494,12 +521,13 @@ macro_rules! __decl_all_modules {
 		$runtime:ident;
 		$system:ident;
 		{ $( $parsed_module:ident :: $parsed_name:ident $(<$instance:ident>)? ,)*};
+		{ $( $parsed_nested:tt )* };
 	) => {
 		pub type System = system::Module<$runtime>;
 		$(
 			pub type $parsed_name = $parsed_module::Module<$runtime $(, $parsed_module::$instance )?>;
 		)*
-		type AllModules = ( $( $parsed_name, )* );
+		type AllModules = ( $( $parsed_nested )* );
 	}
 }