Unverified Commit 1e1169d4 authored by Shaopeng Wang's avatar Shaopeng Wang Committed by GitHub
Browse files

Companion for #6500 (decl_module: frame_system as default ident) (#1314)

* Update decl_storage usage with frame_system as default ident.

* More decl_module usage update.

* 'Update substrate'

Co-authored-by: parity-processbot <>
parent 482abf8c
Pipeline #99742 passed with stages
in 27 minutes and 35 seconds
This diff is collapsed.
...@@ -130,7 +130,7 @@ decl_error! { ...@@ -130,7 +130,7 @@ decl_error! {
decl_module! { decl_module! {
/// Parachain-attestations module. /// Parachain-attestations module.
pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin { pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin, system = system {
type Error = Error<T>; type Error = Error<T>;
/// Provide candidate receipts for parachains, in ascending order by id. /// Provide candidate receipts for parachains, in ascending order by id.
......
...@@ -194,7 +194,7 @@ decl_storage! { ...@@ -194,7 +194,7 @@ decl_storage! {
} }
decl_module! { decl_module! {
pub struct Module<T: Trait> for enum Call where origin: T::Origin { pub struct Module<T: Trait> for enum Call where origin: T::Origin, system = system {
type Error = Error<T>; type Error = Error<T>;
/// The Prefix that is used in signed Ethereum messages for this network /// The Prefix that is used in signed Ethereum messages for this network
......
...@@ -244,7 +244,7 @@ decl_error! { ...@@ -244,7 +244,7 @@ decl_error! {
} }
decl_module! { decl_module! {
pub struct Module<T: Trait> for enum Call where origin: T::Origin { pub struct Module<T: Trait> for enum Call where origin: T::Origin, system = system {
type Error = Error<T>; type Error = Error<T>;
const ModuleId: ModuleId = T::ModuleId::get(); const ModuleId: ModuleId = T::ModuleId::get();
......
...@@ -575,7 +575,7 @@ decl_error! { ...@@ -575,7 +575,7 @@ decl_error! {
decl_module! { decl_module! {
/// Parachains module. /// Parachains module.
pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin { pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin, system = system {
type Error = Error<T>; type Error = Error<T>;
fn on_initialize(now: T::BlockNumber) -> Weight { fn on_initialize(now: T::BlockNumber) -> Weight {
......
...@@ -254,7 +254,7 @@ decl_error! { ...@@ -254,7 +254,7 @@ decl_error! {
decl_module! { decl_module! {
/// Parachains module. /// Parachains module.
pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin { pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin, system = system {
type Error = Error<T>; type Error = Error<T>;
fn deposit_event() = default; fn deposit_event() = default;
......
...@@ -262,7 +262,7 @@ decl_error! { ...@@ -262,7 +262,7 @@ decl_error! {
} }
decl_module! { decl_module! {
pub struct Module<T: Trait> for enum Call where origin: T::Origin { pub struct Module<T: Trait> for enum Call where origin: T::Origin, system = system {
type Error = Error<T>; type Error = Error<T>;
fn deposit_event() = default; fn deposit_event() = default;
......
...@@ -79,7 +79,7 @@ decl_error! { ...@@ -79,7 +79,7 @@ decl_error! {
decl_module! { decl_module! {
/// The parachains configuration module. /// The parachains configuration module.
pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin { pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin, system = system {
type Error = Error<T>; type Error = Error<T>;
/// Set the validation upgrade frequency. /// Set the validation upgrade frequency.
......
...@@ -127,7 +127,7 @@ decl_error! { ...@@ -127,7 +127,7 @@ decl_error! {
decl_module! { decl_module! {
/// The parachain-candidate inclusion module. /// The parachain-candidate inclusion module.
pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin { pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin, system = system {
type Error = Error<T>; type Error = Error<T>;
} }
} }
......
...@@ -62,7 +62,7 @@ decl_error! { ...@@ -62,7 +62,7 @@ decl_error! {
decl_module! { decl_module! {
/// The inclusion inherent module. /// The inclusion inherent module.
pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin { pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin, system = system {
type Error = Error<T>; type Error = Error<T>;
fn on_initialize() -> Weight { fn on_initialize() -> Weight {
......
...@@ -73,7 +73,7 @@ decl_error! { ...@@ -73,7 +73,7 @@ decl_error! {
decl_module! { decl_module! {
/// The initializer module. /// The initializer module.
pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin { pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin, system = system {
type Error = Error<T>; type Error = Error<T>;
fn on_initialize(now: T::BlockNumber) -> Weight { fn on_initialize(now: T::BlockNumber) -> Weight {
......
...@@ -240,7 +240,7 @@ decl_error! { ...@@ -240,7 +240,7 @@ decl_error! {
decl_module! { decl_module! {
/// The parachains configuration module. /// The parachains configuration module.
pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin { pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin, system = system {
type Error = Error<T>; type Error = Error<T>;
} }
} }
......
...@@ -227,7 +227,7 @@ decl_error! { ...@@ -227,7 +227,7 @@ decl_error! {
decl_module! { decl_module! {
/// The scheduler module. /// The scheduler module.
pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin { pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin, system = system {
type Error = Error<T>; type Error = Error<T>;
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment