another way to constraint origin

frame/scheduler/src/benchmarking.rs

@@ -31,10 +31,7 @@ use frame_system::Module as System;
 const MAX_SCHEDULED: u32 = 50;
 
 // Add `n` named items to the schedule
-fn fill_schedule<T: Trait> (when: T::BlockNumber, n: u32) -> Result<(), &'static str>
-where
-	<T as system::Trait>::Origin: OriginTrait<PalletsOrigin = T::PalletsOrigin>
-{
+fn fill_schedule<T: Trait> (when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
 	// Essentially a no-op call.
 	let call = frame_system::Call::set_storage(vec![]);
 	for i in 0..n {

frame/scheduler/src/lib.rs

@@ -51,7 +51,7 @@ use sp_runtime::{RuntimeDebug, traits::{Zero, One}};
 use frame_support::{
 	decl_module, decl_storage, decl_event, decl_error,
 	dispatch::{Dispatchable, DispatchError, DispatchResult, Parameter},
-	traits::{Get, schedule, OriginTrait, EnsureOrigin},
+	traits::{Get, schedule, OriginTrait, EnsureOrigin, IsType},
 	weights::{GetDispatchInfo, Weight},
 };
 use frame_system::{self as system};
@@ -66,7 +66,7 @@ pub trait Trait: system::Trait {
 	type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;
 
 	/// The aggregated origin which the dispatch will take.
-	type Origin: OriginTrait<PalletsOrigin = Self::PalletsOrigin> + From<Self::PalletsOrigin>;
+	type Origin: OriginTrait<PalletsOrigin = Self::PalletsOrigin> + From<Self::PalletsOrigin> + IsType<<Self as system::Trait>::Origin>;
 
 	/// The caller origin, overarching type of all pallets origins.
 	type PalletsOrigin: From<system::RawOrigin<Self::AccountId>> + Codec + Clone + Eq;
@@ -153,11 +153,7 @@ decl_error! {
 
 decl_module! {
 	/// Scheduler module declaration.
-	pub struct Module<T: Trait> for enum Call
-	where
-		origin: <T as system::Trait>::Origin,
-		<T as system::Trait>::Origin: OriginTrait<PalletsOrigin = T::PalletsOrigin>
-	{
+	pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin {
 		type Error = Error<T>;
 		fn deposit_event() = default;
 
@@ -179,6 +175,7 @@ decl_module! {
 			call: Box<<T as Trait>::Call>,
 		) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
+			let origin = <T as Trait>::Origin::from(origin);
 			let _ = Self::do_schedule(when, maybe_periodic, priority, origin.caller().clone(), *call);
 		}
 
@@ -195,6 +192,7 @@ decl_module! {
 		#[weight = 100_000_000 + T::DbWeight::get().reads_writes(1, 2)]
 		fn cancel(origin, when: T::BlockNumber, index: u32) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
+			let origin = <T as Trait>::Origin::from(origin);
 			Self::do_cancel(Some(origin.caller().clone()), (when, index))?;
 		}
 
@@ -217,6 +215,7 @@ decl_module! {
 			call: Box<<T as Trait>::Call>,
 		) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
+			let origin = <T as Trait>::Origin::from(origin);
 			Self::do_schedule_named(id, when, maybe_periodic, priority, origin.caller().clone(), *call)?;
 		}
 
@@ -233,6 +232,7 @@ decl_module! {
 		#[weight = 100_000_000 + T::DbWeight::get().reads_writes(2, 2)]
 		fn cancel_named(origin, id: Vec<u8>) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
+			let origin = <T as Trait>::Origin::from(origin);
 			Self::do_cancel_named(Some(origin.caller().clone()), id)?;
 		}
 
@@ -322,10 +322,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T>
-where
-	<T as system::Trait>::Origin: OriginTrait<PalletsOrigin = T::PalletsOrigin>
-{
+impl<T: Trait> Module<T> {
 	fn do_schedule(
 		when: T::BlockNumber,
 		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
@@ -426,10 +423,7 @@ where
 	}
 }
 
-impl<T: Trait> schedule::Anon<T::BlockNumber, <T as Trait>::Call, T::PalletsOrigin> for Module<T>
-where
-	<T as system::Trait>::Origin: OriginTrait<PalletsOrigin = T::PalletsOrigin>
-{
+impl<T: Trait> schedule::Anon<T::BlockNumber, <T as Trait>::Call, T::PalletsOrigin> for Module<T> {
 	type Address = TaskAddress<T::BlockNumber>;
 
 	fn schedule(
@@ -447,10 +441,7 @@ where
 	}
 }
 
-impl<T: Trait> schedule::Named<T::BlockNumber, <T as Trait>::Call, T::PalletsOrigin> for Module<T>
-where
-	<T as system::Trait>::Origin: OriginTrait<PalletsOrigin = T::PalletsOrigin>
-{
+impl<T: Trait> schedule::Named<T::BlockNumber, <T as Trait>::Call, T::PalletsOrigin> for Module<T> {
 	type Address = TaskAddress<T::BlockNumber>;
 
 	fn schedule_named(
@@ -503,10 +494,6 @@ mod tests {
 		pub trait Trait: system::Trait {
 			type Event: From<Event> + Into<<Self as system::Trait>::Event>;
 		}
-		decl_storage! {
-			trait Store for Module<T: Trait> as Logger {
-			}
-		}
 		decl_event! {
 			pub enum Event {
 				Logged(u32, Weight),

frame/support/src/dispatch.rs

@@ -229,7 +229,7 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # extern crate frame_support;
 /// # use frame_support::dispatch;
 /// # use frame_system::{self as system, ensure_signed};
-/// it: system::Trait {}
+/// pub trait Trait: system::Trait where Self::AccountId: From<u32> {}
 ///
 /// decl_module! {
 /// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin, T::AccountId: From<u32> {
@@ -1452,7 +1452,8 @@ macro_rules! decl_module {
 		pub struct $mod_type<
 			$trait_instance: $trait_name
 			$(<I>, $instance: $instantiable $( = $module_default_instance)?)?
-		>($crate::sp_std::marker::PhantomData<($trait_instance, $( $instance)?)>);
+		>($crate::sp_std::marker::PhantomData<($trait_instance, $( $instance)?)>) where
+			$( $other_where_bounds )*;
 
 		$crate::decl_module! {
 			@impl_on_initialize
@@ -2165,7 +2166,7 @@ mod tests {
 		IntegrityTest,
 	};
 
-	pub trait Trait: system::Trait + Sized {
+	pub trait Trait: system::Trait + Sized where Self::AccountId: From<u32> {
 		type BlockNumber: Into<u32>;
 	}
 

frame/support/test/tests/instance.rs

@@ -41,7 +41,7 @@ pub trait Currency {}
 mod module1 {
 	use super::*;
 
-	pub trait Trait<I>: system::Trait {
+	pub trait Trait<I>: system::Trait where <Self as system::Trait>::BlockNumber: From<u32> {
 		type Event: From<Event<Self, I>> + Into<<Self as system::Trait>::Event>;
 		type Origin: From<Origin<Self, I>>;
 		type SomeParameter: Get<u32>;