Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Implement construct_runtime! macro #751

Merged
gavofyork merged 7 commits into from
Sep 17, 2018
Merged

Implement construct_runtime! macro #751

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f317b18
Make `system` module renamable in `impl_outer_event!`
bkchr Sep 13, 2018
0b37613
Implement `construct_runtime!` macro
bkchr Sep 17, 2018
e0c5bb3
Add documentation
bkchr Sep 17, 2018
e2599d5
Fixes wrong declaration of `contract`
bkchr Sep 17, 2018
604f647
Update dependencies to work on `no_std`
bkchr Sep 17, 2018
f07d5f9
One more `Cargo.lock` update
bkchr Sep 17, 2018
ebd1d71
Address comments
bkchr Sep 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Make system module renamable in impl_outer_event!
  • Loading branch information
@bkchr
bkchr committed Sep 17, 2018
commit f317b18e9aa61fe5541927964805efac35a9e428
75 changes: 70 additions & 5 deletions srml/support/src/event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,21 @@ macro_rules! impl_outer_event {
(
$(#[$attr:meta])*
pub enum $name:ident for $runtime:ident {
$( $rest:tt $( <$t:ident> )*, )*
}
) => {
impl_outer_event!(
$( #[$attr] )*;
$name;
$runtime;
system;
Modules { $( $rest $(<$t>)*, )* };
;
);
};
(
$(#[$attr:meta])*
pub enum $name:ident for $runtime:ident where system = $system:ident {
$module:ident<T>,
$( $rest:tt $( <$t:ident> )*, )*
}
Expand All @@ -281,13 +296,14 @@ macro_rules! impl_outer_event {
$( #[$attr] )*;
$name;
$runtime;
$system;
Modules { $( $rest $(<$t>)*, )* };
$module::Event<$runtime>,;
);
};
(
$(#[$attr:meta])*
pub enum $name:ident for $runtime:ident {
pub enum $name:ident for $runtime:ident where system = $system:ident {
$module:ident,
$( $rest:tt $( <$t:ident> )*, )*
}
Expand All @@ -296,6 +312,7 @@ macro_rules! impl_outer_event {
$( #[$attr] )*;
$name;
$runtime;
$system;
Modules { $( $rest $(<$t>)*, )* };
$module::Event,;
);
Expand All @@ -304,6 +321,7 @@ macro_rules! impl_outer_event {
$(#[$attr:meta])*;
$name:ident;
$runtime:ident;
$system:ident;
Modules {
$module:ident<T>,
$( $rest:tt $( <$t:ident> )*, )*
Expand All @@ -314,6 +332,7 @@ macro_rules! impl_outer_event {
$( #[$attr] )*;
$name;
$runtime;
$system;
Modules { $( $rest $(<$t>)*, )* };
$( $module_name::Event $( <$generic_param> )*, )* $module::Event<$runtime>,;
);
Expand All @@ -322,6 +341,7 @@ macro_rules! impl_outer_event {
$(#[$attr:meta])*;
$name:ident;
$runtime:ident;
$system:ident;
Modules {
$module:ident,
$( $rest:tt, )*
Expand All @@ -332,6 +352,7 @@ macro_rules! impl_outer_event {
$( #[$attr] )*;
$name;
$runtime;
$system;
Modules { $( $rest, )* };
$( $module_name::Event $( <$generic_param> )*, )* $module::Event,;
);
Expand All @@ -340,6 +361,7 @@ macro_rules! impl_outer_event {
$(#[$attr:meta])*;
$name:ident;
$runtime:ident;
$system:ident;
Modules {};
$( $module_name:ident::Event $( <$generic_param:ident> )*, )*;
) => {
Expand All @@ -349,13 +371,13 @@ macro_rules! impl_outer_event {
$(#[$attr])*
#[allow(non_camel_case_types)]
pub enum $name {
system(system::Event),
system($system::Event),
$(
$module_name( $module_name::Event $( <$generic_param> )* ),
)*
}
impl From<system::Event> for $name {
fn from(x: system::Event) -> Self {
impl From<$system::Event> for $name {
fn from(x: $system::Event) -> Self {
$name::system(x)
}
}
Expand All @@ -369,6 +391,7 @@ macro_rules! impl_outer_event {
__impl_outer_event_json_metadata!(
$runtime;
$name;
$system;
$( $module_name::Event $( <$generic_param> )*, )*;
);
}
Expand All @@ -380,13 +403,14 @@ macro_rules! __impl_outer_event_json_metadata {
(
$runtime:ident;
$event_name:ident;
$system:ident;
$( $module_name:ident::Event $( <$generic_param:ident> )*, )*;
) => {
impl $runtime {
#[allow(dead_code)]
pub fn outer_event_json_metadata() -> (&'static str, &'static [(&'static str, fn() -> &'static str)]) {
static METADATA: &[(&str, fn() -> &'static str)] = &[
("system", system::Event::event_json_metadata)
("system", $system::Event::event_json_metadata)
$(
, (
stringify!($module_name),
Expand Down Expand Up @@ -425,6 +449,22 @@ mod tests {
);
}

mod system_renamed {
pub trait Trait {
type Origin;
}

decl_module! {
pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
}

decl_event!(
pub enum Event {
SystemEvent,
}
);
}

mod event_module {
pub trait Trait {
type Origin;
Expand Down Expand Up @@ -488,6 +528,17 @@ mod tests {
}
}

#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, Deserialize, Serialize)]
pub struct TestRuntime2;

impl_outer_event! {
pub enum TestEventSystemRenamed for TestRuntime2 where system = system_renamed {
event_module<T>,
event_module2<T>,
event_module3,
}
}

impl event_module::Trait for TestRuntime {
type Origin = u32;
type Balance = u32;
Expand All @@ -502,6 +553,20 @@ mod tests {
type Origin = u32;
}

impl event_module::Trait for TestRuntime2 {
type Origin = u32;
type Balance = u32;
}

impl event_module2::Trait for TestRuntime2 {
type Origin = u32;
type Balance = u32;
}

impl system_renamed::Trait for TestRuntime2 {
type Origin = u32;
}

const EXPECTED_METADATA: (&str, &[(&str, &str)]) = (
"TestEvent", &[
("system", r#"{ "SystemEvent": { "params": null, "description": [ ] } }"#),
Expand Down