pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 08:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix construct runtime macro (#1838)

Browse Source 
if system wasn't the first module then it crashed
This commit is contained in:
thiolliere
2019-02-21 10:04:40 +01:00
committed by Gav Wood
parent f5ba8a2ad9
commit 19ac5e1e95
4 changed files with 18 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm
BIN
View File
Binary file not shown.
substrate/node/runtime/src/lib.rs
+1 -1
View File
@@ -61,7 +61,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
impl_name: create_runtime_str!("substrate-node"),
authoring_version: 10,
spec_version: 29,
impl_version: 31,
impl_version: 32,
apis: RUNTIME_API_VERSIONS,
};
substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm
BIN
View File
Binary file not shown.
substrate/srml/support/src/runtime.rs
+17 -41
View File
@@ -387,25 +387,22 @@ macro_rules! __create_decl_macro {
macro_rules! $macro_name {
(
$runtime:ident;
System: $module:ident::{
$ingore:ident $d( <$ignor:ident> )* $d(, $modules:ident $d( <$modules_generic:ident> )* )*
}
$d(, $rest_name:ident : $rest_module:ident::{
$d( $rest_modules:ident $d( <$rest_modules_generic:ident> )* ),*
})*
$d( $name:ident : $module:ident::{
$d( $modules:ident $d( <$modules_generic:ident> )* ),*
}),*
) => {
$d crate::$macro_name!(
$d crate::$macro_name!(@inner
$runtime;
$module;
;
;
$d(
$rest_name: $rest_module::{
$d( $rest_modules $d( <$rest_modules_generic> )* ),*
$name: $module::{
$d( $modules $d( <$modules_generic> )* ),*
}
),*;
);
};
(
(@inner
$runtime:ident;
; // there can not be multiple `System`s
$d( $parsed_modules:ident $d( <$parsed_generic:ident> )* ),*;
@@ -416,7 +413,7 @@ macro_rules! __create_decl_macro {
$d( $rest_modules:ident $d( <$rest_modules_generic:ident> )* ),*
})*;
) => {
$d crate::$macro_name!(
$d crate::$macro_name!(@inner
$runtime;
$module;
$d( $parsed_modules $d( <$parsed_generic> )* ),*;
@@ -424,31 +421,10 @@ macro_rules! __create_decl_macro {
$rest_name: $rest_module::{
$d( $rest_modules $d( <$rest_modules_generic> )* ),*
}
)*;
),*;
);
};
(
$runtime:ident;
$name:ident: $module:ident::{
$ingore:ident $d( <$ignor:ident> )* $d(, $modules:ident $d( <$modules_generic:ident> )* )*
}
$d(, $rest_name:ident : $rest_module:ident::{
$d( $rest_modules:ident $d( <$rest_modules_generic:ident> )* ),*
})*
) => {
$d crate::$macro_name!(
$runtime;
;
;
$name: $module::{ $d( $modules $d( <$modules_generic> )* ),* }
$d(
, $rest_name: $rest_module::{
$d( $rest_modules $d( <$rest_modules_generic> )* ),*
}
)*;
);
};
(
(@inner
$runtime:ident;
$d( $system:ident )*;
$d( $parsed_modules:ident $d( <$parsed_generic:ident> )* ),*;
@@ -459,7 +435,7 @@ macro_rules! __create_decl_macro {
$d( $rest_modules:ident $d( <$rest_modules_generic:ident> )* ),*
})*;
) => {
$d crate::$macro_name!(
$d crate::$macro_name!(@inner
$runtime;
$d( $system )*;
$d(
@@ -472,7 +448,7 @@ macro_rules! __create_decl_macro {
),*;
);
};
(
(@inner
$runtime:ident;
$d( $system:ident )*;
$d( $parsed_modules:ident $d( <$parsed_generic:ident> )* ),*;
@@ -483,7 +459,7 @@ macro_rules! __create_decl_macro {
$d( $rest_modules:ident $d( <$rest_modules_generic:ident> )* ),*
})*;
) => {
$d crate::$macro_name!(
$d crate::$macro_name!(@inner
$runtime;
$d( $system )*;
$d( $parsed_modules $d( <$parsed_generic> )* ),*;
@@ -495,7 +471,7 @@ macro_rules! __create_decl_macro {
)*;
);
};
(
(@inner
$runtime:ident;
$d( $system:ident )*;
$d( $parsed_modules:ident $d( <$parsed_generic:ident> )* ),*;
@@ -504,7 +480,7 @@ macro_rules! __create_decl_macro {
$d( $rest_modules:ident $d( <$rest_modules_generic:ident> )* ),*
})*;
) => {
$d crate::$macro_name!(
$d crate::$macro_name!(@inner
$runtime;
$d( $system )*;
$d( $parsed_modules $d( <$parsed_generic> )* ),*;
@@ -515,7 +491,7 @@ macro_rules! __create_decl_macro {
),*;
);
};
(
(@inner
$runtime:ident;
$d( $system:ident )+;
$d( $parsed_modules:ident $d( <$parsed_generic:ident> )* ),*;