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 <>
paritytech · Jul 8, 2020 · 1e1169d · 1e1169d
1 parent 482abf8
commit 1e1169d
Show file tree

Hide file tree

Showing 13 changed files with 149 additions and 150 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtime/common/src/attestations.rs b/runtime/common/src/attestations.rs
@@ -130,7 +130,7 @@ decl_error! {
 
 decl_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>;
 
 		/// Provide candidate receipts for parachains, in ascending order by id.

diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs
@@ -194,7 +194,7 @@ decl_storage! {
 }
 
 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>;
 
 		/// The Prefix that is used in signed Ethereum messages for this network

diff --git a/runtime/common/src/crowdfund.rs b/runtime/common/src/crowdfund.rs
@@ -244,7 +244,7 @@ decl_error! {
 }
 
 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>;
 
 		const ModuleId: ModuleId = T::ModuleId::get();

diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs
@@ -575,7 +575,7 @@ decl_error! {
 
 decl_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>;
 
 		fn on_initialize(now: T::BlockNumber) -> Weight {

diff --git a/runtime/common/src/registrar.rs b/runtime/common/src/registrar.rs
@@ -254,7 +254,7 @@ decl_error! {
 
 decl_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>;
 
 		fn deposit_event() = default;

diff --git a/runtime/common/src/slots.rs b/runtime/common/src/slots.rs
@@ -262,7 +262,7 @@ decl_error! {
 }
 
 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>;
 
 		fn deposit_event() = default;

diff --git a/runtime/parachains/src/configuration.rs b/runtime/parachains/src/configuration.rs
@@ -79,7 +79,7 @@ decl_error! {
 
 decl_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>;
 
 		/// Set the validation upgrade frequency.

diff --git a/runtime/parachains/src/inclusion.rs b/runtime/parachains/src/inclusion.rs
@@ -127,7 +127,7 @@ decl_error! {
 
 decl_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>;
 	}
 }

diff --git a/runtime/parachains/src/inclusion_inherent.rs b/runtime/parachains/src/inclusion_inherent.rs
@@ -62,7 +62,7 @@ decl_error! {
 
 decl_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>;
 
 		fn on_initialize() -> Weight {

diff --git a/runtime/parachains/src/initializer.rs b/runtime/parachains/src/initializer.rs
@@ -73,7 +73,7 @@ decl_error! {
 
 decl_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>;
 
 		fn on_initialize(now: T::BlockNumber) -> Weight {

diff --git a/runtime/parachains/src/paras.rs b/runtime/parachains/src/paras.rs
@@ -240,7 +240,7 @@ decl_error! {
 
 decl_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>;
 	}
 }

diff --git a/runtime/parachains/src/scheduler.rs b/runtime/parachains/src/scheduler.rs
@@ -227,7 +227,7 @@ decl_error! {
 
 decl_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>;
 	}
 }