fix construct runtime module position bug (#1849)

* fix construct runtime module position

* Update srml/support/src/runtime.rs

Co-Authored-By: thiolliere <gui.thiolliere@gmail.com>

* Update srml/support/src/runtime.rs

Co-Authored-By: thiolliere <gui.thiolliere@gmail.com>

* Update srml/support/src/runtime.rs

Co-Authored-By: thiolliere <gui.thiolliere@gmail.com>

* Update srml/support/src/runtime.rs

Co-Authored-By: thiolliere <gui.thiolliere@gmail.com>

* Update srml/support/src/runtime.rs

Co-Authored-By: thiolliere <gui.thiolliere@gmail.com>

substrate/node/runtime/src/lib.rs

@@ -61,7 +61,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	impl_name: create_runtime_str!("substrate-node"),
 	authoring_version: 10,
 	spec_version: 30,
-	impl_version: 30,
+	impl_version: 31,
 	apis: RUNTIME_API_VERSIONS,
 };
 

substrate/srml/support/src/runtime.rs

@@ -339,7 +339,7 @@ macro_rules! construct_runtime {
 			$runtime;
 			;
 			$(
-				$name: $module::{ $( $modules $( <$modules_generic> )* )* }
+				$name: $module::{ $( $modules )* }
 			)*
 		);
 		$crate::__decl_outer_log!(
@@ -718,70 +718,70 @@ macro_rules! __decl_outer_dispatch {
 #[macro_export]
 #[doc(hidden)]
 macro_rules! __decl_runtime_metadata {
-	// contain a module
+	// leading is Module : parse
 	(
 		$runtime:ident;
 		$( $parsed_modules:ident { $( $withs:ident )* } )*;
+		$( { leading_module: $( $leading_module:ident )* } )?
 		$name:ident: $module:ident::{
-			Module $( $modules:ident $( <$modules_generic:ident> )* )*
+			Module $( $modules:ident )*
 		}
 		$( $rest_name:ident : $rest_module:ident::{
-			$( $rest_modules:ident $( <$rest_modules_generic:ident> )* )*
+			$( $rest_modules:ident )*
 		})*
 	) => {
-
-		$crate::__decl_runtime_metadata!(@Module
+		$crate::__decl_runtime_metadata!(
 			$runtime;
-			$( $parsed_modules { $( $withs )* } )*;
-			$name: $module::{ $( $modules $( <$modules_generic> )* )* }
+			$( $parsed_modules { $( $withs )* } )* $module { $( $( $leading_module )* )? $( $modules )* };
 			$(
 				$rest_name: $rest_module::{
-					$( $rest_modules $( <$rest_modules_generic> )* )*
+					$( $rest_modules )*
 				}
 			)*
 		);
 	};
-	// do not contain Module : skip
+	// leading isn't Module : put it in leadings
 	(
 		$runtime:ident;
 		$( $parsed_modules:ident { $( $withs:ident )* } )*;
+		$( { leading_module: $( $leading_module:ident )* } )?
 		$name:ident: $module:ident::{
-			$( $modules:ident $( <$modules_generic:ident> )* )*
+			$other_module:ident $( $modules:ident )*
 		}
 		$( $rest_name:ident : $rest_module:ident::{
-			$( $rest_modules:ident $( <$rest_modules_generic:ident> )* )*
+			$( $rest_modules:ident )*
 		})*
 	) => {
 		$crate::__decl_runtime_metadata!(
 			$runtime;
 			$( $parsed_modules { $( $withs )* } )*;
+			{ leading_module: $( $( $leading_module )* )? $other_module }
+			$name: $module::{
+				$( $modules )*
+			}
 			$(
 				$rest_name: $rest_module::{
-					$( $rest_modules $( <$rest_modules_generic> )* )*
+					$( $rest_modules )*
 				}
 			)*
 		);
 	};
-	// process module
-	(@Module
+	// does not contain Module : skip
+	(
 		$runtime:ident;
 		$( $parsed_modules:ident { $( $withs:ident )* } )*;
-		$name:ident: $module:ident::{
-			$( $modules:ident $( <$modules_generic:ident> )* )*
-		}
-		$($rest_name:ident : $rest_module:ident::{
-			$( $rest_modules:ident $( <$rest_modules_generic:ident> )* )*
+		$( { leading_module: $( $leading_module:ident )* } )?
+		$name:ident: $module:ident::{}
+		$( $rest_name:ident : $rest_module:ident::{
+			$( $rest_modules:ident )*
 		})*
 	) => {
 		$crate::__decl_runtime_metadata!(
 			$runtime;
-			$( $parsed_modules { $( $withs )* } )*
-			$module {
-				$($modules)*
-			};
+			$( $parsed_modules { $( $withs )* } )*;
 			$(
 				$rest_name: $rest_module::{
-					$( $rest_modules $( <$rest_modules_generic> )* )*
+					$( $rest_modules )*
 				}
 			)*
 		);