pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-28 03:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moves node-template into substrate repo (#1637)

Browse Source 
* Make runtime macros work without required `macro_use`

* Adds node-template

* Adds node-template-release tool

* Fixes building `node-template` and improve the release

* Add `profile.release` by release script to remove warning

* Adds script for releasing the node template

* Fixes compilation after master merge

* Port node-template to edition 2018

* Remove license

* Fixes compilation after master merge

* Add `node-template-release.sh` into the CI

* WIP Ci integrate node template (#1701)

* copy artifacts to s3 bucket latest path

* typo

* bucket name

* Update wasm files
This commit is contained in:
Bastian Köcher
2019-02-06 17:15:12 +01:00
committed by GitHub
parent b6fd967dfb
commit 567122fab5
38 changed files with 3362 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/srml/support/src/dispatch.rs
+15 -15
View File
@@ -690,13 +690,13 @@ macro_rules! decl_module {
impl<$trait_instance: $trait_name> $crate::dispatch::Decode for $call_type<$trait_instance> {
fn decode<I: $crate::dispatch::Input>(input: &mut I) -> Option<Self> {
let _input_id = input.read_byte()?;
__impl_decode!(input; _input_id; 0; $call_type; $( fn $fn_name( $( $(#[$codec_attr on type $param])* $param_name ),* ); )*)
$crate::__impl_decode!(input; _input_id; 0; $call_type; $( fn $fn_name( $( $(#[$codec_attr on type $param])* $param_name ),* ); )*)
}
}
impl<$trait_instance: $trait_name> $crate::dispatch::Encode for $call_type<$trait_instance> {
fn encode_to<W: $crate::dispatch::Output>(&self, _dest: &mut W) {
__impl_encode!(_dest; *self; 0; $call_type; $( fn $fn_name( $( $(#[$codec_attr on type $param])* $param_name ),* ); )*);
$crate::__impl_encode!(_dest; *self; 0; $call_type; $( fn $fn_name( $( $(#[$codec_attr on type $param])* $param_name ),* ); )*);
if let $call_type::__PhantomItem(_) = *self { unreachable!() }
if let $call_type::__OtherPhantomItem(_) = *self { unreachable!() }
}
@@ -710,7 +710,7 @@ macro_rules! decl_module {
match self {
$(
$call_type::$fn_name( $( $param_name ),* ) => {
decl_module!(
$crate::decl_module!(
@call
$from
$mod_type $trait_instance $fn_name _origin $system [ $( $param_name ),* ]
@@ -755,7 +755,7 @@ macro_rules! __impl_decode {
{
if $input_id == ($fn_id) {
$(
__impl_decode!(@decode
$crate::__impl_decode!(@decode
$(#[$codec_attr on type $param])*
$param_name;
$input;
@@ -764,7 +764,7 @@ macro_rules! __impl_decode {
return Some($call_type:: $fn_name( $( $param_name ),* ));
}
__impl_decode!($input; $input_id; $fn_id + 1; $call_type; $($rest)*)
$crate::__impl_decode!($input; $input_id; $fn_id + 1; $call_type; $($rest)*)
}
};
(
@@ -822,7 +822,7 @@ macro_rules! __impl_encode {
) = $self {
$dest.push_byte(($fn_id) as u8);
$(
__impl_encode!(@encode_as
$crate::__impl_encode!(@encode_as
$(#[$codec_attr on type $param])*
$param_name;
$dest;
@@ -830,7 +830,7 @@ macro_rules! __impl_encode {
)*
}
__impl_encode!($dest; $self; $fn_id + 1; $call_type; $($rest)*)
$crate::__impl_encode!($dest; $self; $fn_id + 1; $call_type; $($rest)*)
}
};
(
@@ -887,7 +887,7 @@ macro_rules! impl_outer_dispatch {
$camelcase ( $crate::dispatch::CallableCallFor<$camelcase> )
,)*
}
__impl_outer_dispatch_common! { $call_type, $($camelcase,)* }
$crate::__impl_outer_dispatch_common! { $call_type, $($camelcase,)* }
impl $crate::dispatch::Dispatchable for $call_type {
type Origin = $origin;
type Trait = $call_type;
@@ -923,13 +923,13 @@ macro_rules! __impl_outer_dispatch_common {
impl $crate::dispatch::Decode for $call_type {
fn decode<I: $crate::dispatch::Input>(input: &mut I) -> Option<Self> {
let input_id = input.read_byte()?;
__impl_decode!(input; input_id; 0; $call_type; $( fn $camelcase ( outer_dispatch_param ); )*)
$crate::__impl_decode!(input; input_id; 0; $call_type; $( fn $camelcase ( outer_dispatch_param ); )*)
}
}
impl $crate::dispatch::Encode for $call_type {
fn encode_to<W: $crate::dispatch::Output>(&self, dest: &mut W) {
__impl_encode!(dest; *self; 0; $call_type; $( fn $camelcase( outer_dispatch_param ); )*)
$crate::__impl_encode!(dest; *self; 0; $call_type; $( fn $camelcase( outer_dispatch_param ); )*)
}
}
}
@@ -945,7 +945,7 @@ macro_rules! __dispatch_impl_metadata {
) => {
impl<$trait_instance: $trait_name> $mod_type<$trait_instance> {
pub fn call_functions() -> &'static [$crate::dispatch::FunctionMetadata] {
__call_to_functions!($($rest)*)
$crate::__call_to_functions!($($rest)*)
}
}
}
@@ -966,7 +966,7 @@ macro_rules! __call_to_functions {
);
)*}
) => {
__functions_to_metadata!(0; $origin_type;; $(
$crate::__functions_to_metadata!(0; $origin_type;; $(
fn $fn_name( $($(#[$codec_attr])* $param_name: $param ),* );
$( $doc_attr ),*;
)*)
@@ -990,9 +990,9 @@ macro_rules! __functions_to_metadata{
$( $fn_doc:expr ),*;
$( $rest:tt )*
) => {
__functions_to_metadata!(
$crate::__functions_to_metadata!(
$fn_id + 1; $origin_type;
$( $function_metadata, )* __function_to_metadata!(
$( $function_metadata, )* $crate::__function_to_metadata!(
fn $fn_name($( $(#[$codec_attr])* $param_name : $param ),*); $( $fn_doc ),*; $fn_id;
);
$($rest)*
@@ -1025,7 +1025,7 @@ macro_rules! __function_to_metadata {
$crate::dispatch::FunctionArgumentMetadata {
name: $crate::dispatch::DecodeDifferent::Encode(stringify!($param_name)),
ty: $crate::dispatch::DecodeDifferent::Encode(
__function_to_metadata!(@stringify_expand_attr
$crate::__function_to_metadata!(@stringify_expand_attr
$(#[$codec_attr])* $param_name: $param
)
),
substrate/srml/support/src/event.rs
+6 -6
View File
@@ -282,7 +282,7 @@ macro_rules! impl_outer_event {
$( $rest:tt $( <$t:ident> )*, )*
}
) => {
impl_outer_event!(
$crate::impl_outer_event!(
$( #[$attr] )*;
$name;
$runtime;
@@ -298,7 +298,7 @@ macro_rules! impl_outer_event {
$( $rest:tt $( <$t:ident> )*, )*
}
) => {
impl_outer_event!(
$crate::impl_outer_event!(
$( #[$attr] )*;
$name;
$runtime;
@@ -314,7 +314,7 @@ macro_rules! impl_outer_event {
$( $rest:tt $( <$t:ident> )*, )*
}
) => {
impl_outer_event!(
$crate::impl_outer_event!(
$( #[$attr] )*;
$name;
$runtime;
@@ -334,7 +334,7 @@ macro_rules! impl_outer_event {
};
$( $module_name:ident::Event $( <$generic_param:ident> )*, )*;
) => {
impl_outer_event!(
$crate::impl_outer_event!(
$( #[$attr] )*;
$name;
$runtime;
@@ -354,7 +354,7 @@ macro_rules! impl_outer_event {
};
$( $module_name:ident::Event $( <$generic_param:ident> )*, )*;
) => {
impl_outer_event!(
$crate::impl_outer_event!(
$( #[$attr] )*;
$name;
$runtime;
@@ -397,7 +397,7 @@ macro_rules! impl_outer_event {
}
}
)*
__impl_outer_event_json_metadata!(
$crate::__impl_outer_event_json_metadata!(
$runtime;
$name;
$system;
substrate/srml/support/src/lib.rs
-3
View File
@@ -113,9 +113,6 @@ macro_rules! assert_ok {
#[cfg_attr(feature = "std", derive(Debug))]
pub enum Void {}
#[doc(hidden)]
pub use mashup::*;
#[cfg(feature = "std")]
#[doc(hidden)]
pub use serde_derive::*;
substrate/srml/support/src/metadata.rs
+19 -19
View File
@@ -38,7 +38,7 @@ macro_rules! impl_runtime_metadata {
pub fn metadata() -> $crate::metadata::RuntimeMetadataPrefixed {
$crate::metadata::RuntimeMetadata::V1 (
$crate::metadata::RuntimeMetadataV1 {
modules: __runtime_modules_to_metadata!($runtime;; $( $rest )*),
modules: $crate::__runtime_modules_to_metadata!($runtime;; $( $rest )*),
}
).into()
}
@@ -55,14 +55,14 @@ macro_rules! __runtime_modules_to_metadata {
$mod:ident::$module:ident $(with)+ $($kw:ident)*,
$( $rest:tt )*
) => {
__runtime_modules_to_metadata!(
$crate::__runtime_modules_to_metadata!(
$runtime;
$( $metadata, )* $crate::metadata::ModuleMetadata {
name: $crate::metadata::DecodeDifferent::Encode(stringify!($mod)),
prefix: __runtime_modules_to_metadata_calls_storagename!($mod, $module, $runtime, $(with $kw)*),
storage: __runtime_modules_to_metadata_calls_storage!($mod, $module, $runtime, $(with $kw)*),
calls: __runtime_modules_to_metadata_calls_call!($mod, $module, $runtime, $(with $kw)*),
event: __runtime_modules_to_metadata_calls_event!($mod, $module, $runtime, $(with $kw)*),
prefix: $crate::__runtime_modules_to_metadata_calls_storagename!($mod, $module, $runtime, $(with $kw)*),
storage: $crate::__runtime_modules_to_metadata_calls_storage!($mod, $module, $runtime, $(with $kw)*),
calls: $crate::__runtime_modules_to_metadata_calls_call!($mod, $module, $runtime, $(with $kw)*),
event: $crate::__runtime_modules_to_metadata_calls_event!($mod, $module, $runtime, $(with $kw)*),
};
$( $rest )*
)
@@ -83,7 +83,7 @@ macro_rules! __runtime_modules_to_metadata_calls_call {
system,
$skip_module: ident,
$skip_runtime: ident,
with Call
with Call
$(with $kws:ident)*
) => {
None
@@ -92,7 +92,7 @@ macro_rules! __runtime_modules_to_metadata_calls_call {
$mod: ident,
$module: ident,
$runtime: ident,
with Call
with Call
$(with $kws:ident)*
) => {
Some($crate::metadata::DecodeDifferent::Encode(
@@ -105,10 +105,10 @@ macro_rules! __runtime_modules_to_metadata_calls_call {
$mod: ident,
$module: ident,
$runtime: ident,
with $_:ident
with $_:ident
$(with $kws:ident)*
) => {
__runtime_modules_to_metadata_calls_call!( $mod, $module, $runtime, $(with $kws)* );
$crate::__runtime_modules_to_metadata_calls_call!( $mod, $module, $runtime, $(with $kws)* );
};
(
$mod: ident,
@@ -127,7 +127,7 @@ macro_rules! __runtime_modules_to_metadata_calls_event {
$mod: ident,
$module: ident,
$runtime: ident,
with Event
with Event
$(with $kws:ident)*
) => {
Some($crate::metadata::DecodeDifferent::Encode(
@@ -142,10 +142,10 @@ macro_rules! __runtime_modules_to_metadata_calls_event {
$mod: ident,
$module: ident,
$runtime: ident,
with $_:ident
with $_:ident
$(with $kws:ident)*
) => {
__runtime_modules_to_metadata_calls_event!( $mod, $module, $runtime, $(with $kws)* );
$crate::__runtime_modules_to_metadata_calls_event!( $mod, $module, $runtime, $(with $kws)* );
};
(
$mod: ident,
@@ -163,7 +163,7 @@ macro_rules! __runtime_modules_to_metadata_calls_storagename {
$mod: ident,
$module: ident,
$runtime: ident,
with Storage
with Storage
$(with $kws:ident)*
) => {
$crate::metadata::DecodeDifferent::Encode(
@@ -176,10 +176,10 @@ macro_rules! __runtime_modules_to_metadata_calls_storagename {
$mod: ident,
$module: ident,
$runtime: ident,
with $_:ident
with $_:ident
$(with $kws:ident)*
) => {
__runtime_modules_to_metadata_calls_storagename!( $mod, $module, $runtime, $(with $kws)* );
$crate::__runtime_modules_to_metadata_calls_storagename!( $mod, $module, $runtime, $(with $kws)* );
};
(
$mod: ident,
@@ -199,7 +199,7 @@ macro_rules! __runtime_modules_to_metadata_calls_storage {
$mod: ident,
$module: ident,
$runtime: ident,
with Storage
with Storage
$(with $kws:ident)*
) => {
Some($crate::metadata::DecodeDifferent::Encode(
@@ -212,10 +212,10 @@ macro_rules! __runtime_modules_to_metadata_calls_storage {
$mod: ident,
$module: ident,
$runtime: ident,
with $_:ident
with $_:ident
$(with $kws:ident)*
) => {
__runtime_modules_to_metadata_calls_storage!( $mod, $module, $runtime, $(with $kws)* );
$crate::__runtime_modules_to_metadata_calls_storage!( $mod, $module, $runtime, $(with $kws)* );
};
(
$mod: ident,
substrate/srml/support/src/origin.rs
+7 -7
View File
@@ -17,7 +17,7 @@
//! Macros that define an Origin type. Every function call to your runtime has an origin which
//! specifies where the extrinsic was generated from.
/// Constructs an Origin type for a runtime. This is usually called automatically by the
/// Constructs an Origin type for a runtime. This is usually called automatically by the
/// construct_runtime macro. See also __create_decl_macro.
#[macro_export]
macro_rules! impl_outer_origin {
@@ -31,7 +31,7 @@ macro_rules! impl_outer_origin {
$( $module:ident $( <$generic:ident> )* ),* $(,)*
}
) => {
impl_outer_origin! {
$crate::impl_outer_origin! {
$(#[$attr])*
pub enum $name for $runtime where system = system {
$( $module $( <$generic> )*, )*
@@ -42,7 +42,7 @@ macro_rules! impl_outer_origin {
$(#[$attr:meta])*
pub enum $name:ident for $runtime:ident where system = $system:ident {}
) => {
impl_outer_origin!(
$crate::impl_outer_origin!(
$( #[$attr] )*;
$name;
$runtime;
@@ -58,7 +58,7 @@ macro_rules! impl_outer_origin {
$( $rest_module:ident $( <$rest_generic:ident> )* ),* $(,)*
}
) => {
impl_outer_origin!(
$crate::impl_outer_origin!(
$( #[$attr] )*;
$name;
$runtime;
@@ -74,7 +74,7 @@ macro_rules! impl_outer_origin {
$( $rest_module:ident $( <$rest_generic:ident> )* ),* $(,)*
}
) => {
impl_outer_origin!(
$crate::impl_outer_origin!(
$( #[$attr] )*;
$name;
$runtime;
@@ -94,7 +94,7 @@ macro_rules! impl_outer_origin {
};
$( $parsed_module:ident $( <$generic_param:ident> )* ),*;
) => {
impl_outer_origin!(
$crate::impl_outer_origin!(
$( #[$attr] )*;
$name;
$runtime;
@@ -114,7 +114,7 @@ macro_rules! impl_outer_origin {
};
$( $parsed_module:ident $( <$generic_param:ident> )* ),*;
) => {
impl_outer_origin!(
$crate::impl_outer_origin!(
$( #[$attr] )*;
$name;
$runtime;
substrate/srml/support/src/runtime.rs
+44 -53
View File
@@ -299,15 +299,6 @@ macro_rules! construct_runtime {
}
),*;
) => {
// This generates a substrate_generate_ident_name macro that will substitute
// "config-ident FooModule" => FooModuleConfig for every module included in the
// runtime.
mashup! {
$(
substrate_generate_ident_name["config-ident" $name] = $name Config;
)*
}
#[derive(Clone, Copy, PartialEq, Eq)]
#[cfg_attr(feature = "std", derive(Debug))]
pub struct $runtime;
@@ -317,19 +308,19 @@ macro_rules! construct_runtime {
impl $crate::runtime_primitives::traits::GetRuntimeBlockType for $runtime {
type RuntimeBlock = $block;
}
__decl_outer_event!(
$crate::__decl_outer_event!(
$runtime;
$(
$name: $module::{ $( $modules $( <$modules_generic> )* ),* }
),*
);
__decl_outer_origin!(
$crate::__decl_outer_origin!(
$runtime;
$(
$name: $module::{ $( $modules $( <$modules_generic> )* ),* }
),*
);
__decl_all_modules!(
$crate::__decl_all_modules!(
$runtime;
;
;
@@ -337,21 +328,21 @@ macro_rules! construct_runtime {
$name: $module::{ $( $modules $( <$modules_generic> )* ),* }
),*;
);
__decl_outer_dispatch!(
$crate::__decl_outer_dispatch!(
$runtime;
;
$(
$name: $module::{ $( $modules $( <$modules_generic> )* ),* }
),*;
);
__decl_runtime_metadata!(
$crate::__decl_runtime_metadata!(
$runtime;
;
$(
$name: $module::{ $( $modules $( <$modules_generic> )* )* }
)*
);
__decl_outer_log!(
$crate::__decl_outer_log!(
$runtime;
$log_internal < $( $log_genarg ),* >;
;
@@ -359,14 +350,14 @@ macro_rules! construct_runtime {
$name: $module::{ $( $modules $( ( $( $modules_args ),* ) )* ),* }
),*;
);
__decl_outer_config!(
$crate::__decl_outer_config!(
$runtime;
;
$(
$name: $module::{ $( $modules $( <$modules_generic> )* ),* }
),*;
);
__decl_outer_inherent!(
$crate::__decl_outer_inherent!(
$runtime;
$block;
$uncheckedextrinsic;
@@ -403,7 +394,7 @@ macro_rules! __create_decl_macro {
$d( $rest_modules:ident $d( <$rest_modules_generic:ident> )* ),*
})*
) => {
$macro_name!(
$d crate::$macro_name!(
$runtime;
$module;
;
@@ -425,7 +416,7 @@ macro_rules! __create_decl_macro {
$d( $rest_modules:ident $d( <$rest_modules_generic:ident> )* ),*
})*;
) => {
$macro_name!(
$d crate::$macro_name!(
$runtime;
$module;
$d( $parsed_modules $d( <$parsed_generic> )* ),*;
@@ -445,7 +436,7 @@ macro_rules! __create_decl_macro {
$d( $rest_modules:ident $d( <$rest_modules_generic:ident> )* ),*
})*
) => {
$macro_name!(
$d crate::$macro_name!(
$runtime;
;
;
@@ -468,7 +459,7 @@ macro_rules! __create_decl_macro {
$d( $rest_modules:ident $d( <$rest_modules_generic:ident> )* ),*
})*;
) => {
$macro_name!(
$d crate::$macro_name!(
$runtime;
$d( $system )*;
$d(
@@ -492,7 +483,7 @@ macro_rules! __create_decl_macro {
$d( $rest_modules:ident $d( <$rest_modules_generic:ident> )* ),*
})*;
) => {
$macro_name!(
$d crate::$macro_name!(
$runtime;
$d( $system )*;
$d( $parsed_modules $d( <$parsed_generic> )* ),*;
@@ -513,7 +504,7 @@ macro_rules! __create_decl_macro {
$d( $rest_modules:ident $d( <$rest_modules_generic:ident> )* ),*
})*;
) => {
$macro_name!(
$d crate::$macro_name!(
$runtime;
$d( $system )*;
$d( $parsed_modules $d( <$parsed_generic> )* ),*;
@@ -530,7 +521,7 @@ macro_rules! __create_decl_macro {
$d( $parsed_modules:ident $d( <$parsed_generic:ident> )* ),*;
;
) => {
$macro_outer_name! {
$d crate::$macro_outer_name! {
pub enum $macro_enum_name for $runtime where system = $d( $system )* {
$d(
$parsed_modules $d( <$parsed_generic> )*,
@@ -560,7 +551,7 @@ macro_rules! __decl_all_modules {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* ),*
})*;
) => {
__decl_all_modules!(
$crate::__decl_all_modules!(
$runtime;
$module;
$( $parsed_modules :: $parsed_name ),*;
@@ -582,7 +573,7 @@ macro_rules! __decl_all_modules {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* ),*
})*;
) => {
__decl_all_modules!(
$crate::__decl_all_modules!(
$runtime;
$( $system )*;
$( $parsed_modules :: $parsed_name, )* $module::$name;
@@ -604,7 +595,7 @@ macro_rules! __decl_all_modules {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* ),*
})*;
) => {
__decl_all_modules!(
$crate::__decl_all_modules!(
$runtime;
$( $system )*;
$( $parsed_modules :: $parsed_name ),*;
@@ -625,7 +616,7 @@ macro_rules! __decl_all_modules {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* ),*
})*;
) => {
__decl_all_modules!(
$crate::__decl_all_modules!(
$runtime;
$( $system )*;
$( $parsed_modules :: $parsed_name ),*;
@@ -665,7 +656,7 @@ macro_rules! __decl_outer_dispatch {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* ),*
})*;
) => {
__decl_outer_dispatch!(
$crate::__decl_outer_dispatch!(
$runtime;
$( $parsed_modules :: $parsed_name ),*;
$(
@@ -685,7 +676,7 @@ macro_rules! __decl_outer_dispatch {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* ),*
})*;
) => {
__decl_outer_dispatch!(
$crate::__decl_outer_dispatch!(
$runtime;
$( $parsed_modules :: $parsed_name, )* $module::$name;
$(
@@ -705,7 +696,7 @@ macro_rules! __decl_outer_dispatch {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* ),*
})*;
) => {
__decl_outer_dispatch!(
$crate::__decl_outer_dispatch!(
$runtime;
$( $parsed_modules :: $parsed_name ),*;
$name: $module::{ $( $modules $( <$modules_generic> )* ),* }
@@ -724,7 +715,7 @@ macro_rules! __decl_outer_dispatch {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* ),*
})*;
) => {
__decl_outer_dispatch!(
$crate::__decl_outer_dispatch!(
$runtime;
$( $parsed_modules :: $parsed_name ),*;
$(
@@ -739,7 +730,7 @@ macro_rules! __decl_outer_dispatch {
$( $parsed_modules:ident :: $parsed_name:ident ),*;
;
) => {
impl_outer_dispatch!(
$crate::impl_outer_dispatch!(
pub enum Call for $runtime where origin: Origin {
$( $parsed_modules::$parsed_name, )*
}
@@ -763,7 +754,7 @@ macro_rules! __decl_runtime_metadata {
})*
) => {
__decl_runtime_metadata!(@Module
$crate::__decl_runtime_metadata!(@Module
$runtime;
$( $parsed_modules { $( $withs )* } )*;
$name: $module::{ $( $modules $( <$modules_generic> )* )* }
@@ -785,7 +776,7 @@ macro_rules! __decl_runtime_metadata {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* )*
})*
) => {
__decl_runtime_metadata!(
$crate::__decl_runtime_metadata!(
$runtime;
$( $parsed_modules { $( $withs )* } )*;
$(
@@ -806,7 +797,7 @@ macro_rules! __decl_runtime_metadata {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* )*
})*
) => {
__decl_runtime_metadata!(
$crate::__decl_runtime_metadata!(
$runtime;
$( $parsed_modules { $( $withs )* } )*
$module {
@@ -824,7 +815,7 @@ macro_rules! __decl_runtime_metadata {
$runtime:ident;
$( $parsed_modules:ident { $( $withs:ident )* } )*;
) => {
impl_runtime_metadata!(
$crate::impl_runtime_metadata!(
for $runtime with modules
$( $parsed_modules::Module with $( $withs )* , )*
);
@@ -847,7 +838,7 @@ macro_rules! __decl_outer_log {
$( $rest_modules:ident $( ( $( $rest_modules_args:ident )* ) )* ),*
})*;
) => {
__decl_outer_log!(
$crate::__decl_outer_log!(
$runtime;
$log_internal < $( $log_genarg ),* >;
$( $parsed_modules ( $( $parsed_args ),* ), )* $module ( $( $args ),* );
@@ -870,7 +861,7 @@ macro_rules! __decl_outer_log {
$( $rest_modules:ident $( ( $( $rest_modules_args:ident )* ) )* ),*
})*;
) => {
__decl_outer_log!(
$crate::__decl_outer_log!(
$runtime;
$log_internal < $( $log_genarg ),* >;
$( $parsed_modules ( $( $parsed_args ),* ) ),*;
@@ -891,7 +882,7 @@ macro_rules! __decl_outer_log {
$( $rest_modules:ident $( ( $( $rest_modules_args:ident )* ) )* ),*
})*;
) => {
__decl_outer_log!(
$crate::__decl_outer_log!(
$runtime;
$log_internal < $( $log_genarg ),* >;
$( $parsed_modules ( $( $parsed_args ),* ) ),*;
@@ -908,7 +899,7 @@ macro_rules! __decl_outer_log {
$( $parsed_modules:ident( $( $parsed_args:ident ),* ) ),*;
;
) => {
impl_outer_log!(
$crate::runtime_primitives::impl_outer_log!(
pub enum Log($log_internal: DigestItem<$( $log_genarg ),*>) for $runtime {
$( $parsed_modules ( $( $parsed_args ),* ) ),*
}
@@ -930,7 +921,7 @@ macro_rules! __decl_outer_config {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* ),*
})*;
) => {
__decl_outer_config!(
$crate::__decl_outer_config!(
$runtime;
$( $parsed_modules :: $parsed_name $( < $parsed_generic > )*, )* $module::$name;
$(
@@ -950,7 +941,7 @@ macro_rules! __decl_outer_config {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* ),*
})*;
) => {
__decl_outer_config!(
$crate::__decl_outer_config!(
$runtime;
$( $parsed_modules :: $parsed_name $( < $parsed_generic > )*, )* $module::$name<T>;
$(
@@ -970,7 +961,7 @@ macro_rules! __decl_outer_config {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* ),*
})*;
) => {
__decl_outer_config!(
$crate::__decl_outer_config!(
$runtime;
$( $parsed_modules :: $parsed_name $( < $parsed_generic > )*),*;
$name: $module::{ $( $modules $( <$modules_generic> )* ),* }
@@ -989,7 +980,7 @@ macro_rules! __decl_outer_config {
$( $rest_modules:ident $( <$rest_modules_generic:ident> )* ),*
})*;
) => {
__decl_outer_config!(
$crate::__decl_outer_config!(
$runtime;
$( $parsed_modules :: $parsed_name $( < $parsed_generic > )*),*;
$(
@@ -1004,11 +995,11 @@ macro_rules! __decl_outer_config {
$( $parsed_modules:ident :: $parsed_name:ident $( < $parsed_generic:ident > )* ),*;
;
) => {
substrate_generate_ident_name! {
impl_outer_config!(
$crate::paste::item! {
$crate::runtime_primitives::impl_outer_config!(
pub struct GenesisConfig for $runtime {
$(
"config-ident" $parsed_name => $parsed_modules $( < $parsed_generic > )*,
[< $parsed_name Config >] => $parsed_modules $( < $parsed_generic > )*,
)*
}
);
@@ -1032,7 +1023,7 @@ macro_rules! __decl_outer_inherent {
$( $rest_modules:ident $( ( $( $rest_call:ident )* ) )* ),*
})*;
) => {
__decl_outer_inherent!(
$crate::__decl_outer_inherent!(
$runtime;
$block;
$uncheckedextrinsic;
@@ -1056,7 +1047,7 @@ macro_rules! __decl_outer_inherent {
$( $rest_modules:ident $( ( $( $rest_call:ident )* ) )* ),*
})*;
) => {
__decl_outer_inherent!(
$crate::__decl_outer_inherent!(
$runtime;
$block;
$uncheckedextrinsic;
@@ -1081,7 +1072,7 @@ macro_rules! __decl_outer_inherent {
$( $rest_modules:ident $( ( $( $rest_call:ident )* ) )* ),*
})*;
) => {
__decl_outer_inherent!(
$crate::__decl_outer_inherent!(
$runtime;
$block;
$uncheckedextrinsic;
@@ -1104,7 +1095,7 @@ macro_rules! __decl_outer_inherent {
$( $rest_modules:ident $( ( $( $rest_call:ident )* ) )* ),*
})*;
) => {
__decl_outer_inherent!(
$crate::__decl_outer_inherent!(
$runtime;
$block;
$uncheckedextrinsic;
@@ -1123,7 +1114,7 @@ macro_rules! __decl_outer_inherent {
$( $parsed_name:ident :: $parsed_call:ident ),*;
;
) => {
impl_outer_inherent!(
$crate::impl_outer_inherent!(
impl Inherents where Block = $block, UncheckedExtrinsic = $uncheckedextrinsic {
$( $parsed_name : $parsed_call, )*
}