fix tests

frame/democracy/src/tests.rs

@@ -115,6 +115,7 @@ parameter_types! {
 impl pallet_scheduler::Trait for Test {
 	type Event = Event;
 	type Origin = Origin;
+	type PalletsOrigin = OriginCaller;
 	type Call = Call;
 	type MaximumWeight = MaximumSchedulerWeight;
 }
@@ -188,6 +189,7 @@ impl super::Trait for Test {
 	type Scheduler = Scheduler;
 	type MaxVotes = MaxVotes;
 	type OperationalPreimageOrigin = EnsureSignedBy<Six, u64>;
+	type PalletsOrigin = OriginCaller;
 }
 
 pub fn new_test_ext() -> sp_io::TestExternalities {

frame/scheduler/src/lib.rs

@@ -549,6 +549,7 @@ mod tests {
 	impl Trait for Test {
 		type Event = ();
 		type Origin = Origin;
+		type PalletsOrigin = OriginCaller;
 		type Call = Call;
 		type MaximumWeight = MaximumSchedulerWeight;
 	}
@@ -574,7 +575,9 @@ mod tests {
 	#[test]
 	fn basic_scheduling_works() {
 		new_test_ext().execute_with(|| {
-			Scheduler::do_schedule(4, None, 127, Call::Logger(logger::Call::log(42, 1000)));
+			Scheduler::do_schedule(
+				4, None, 127, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(42, 1000))
+			);
 			run_to_block(3);
 			assert!(logger::log().is_empty());
 			run_to_block(4);
@@ -588,7 +591,9 @@ mod tests {
 	fn periodic_scheduling_works() {
 		new_test_ext().execute_with(|| {
 			// at #4, every 3 blocks, 3 times.
-			Scheduler::do_schedule(4, Some((3, 3)), 127, Call::Logger(logger::Call::log(42, 1000)));
+			Scheduler::do_schedule(
+				4, Some((3, 3)), 127, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(42, 1000))
+			);
 			run_to_block(3);
 			assert!(logger::log().is_empty());
 			run_to_block(4);
@@ -610,8 +615,12 @@ mod tests {
 	fn cancel_named_scheduling_works_with_normal_cancel() {
 		new_test_ext().execute_with(|| {
 			// at #4.
-			Scheduler::do_schedule_named(1u32.encode(), 4, None, 127, Call::Logger(logger::Call::log(69, 1000))).unwrap();
-			let i = Scheduler::do_schedule(4, None, 127, Call::Logger(logger::Call::log(42, 1000)));
+			Scheduler::do_schedule_named(
+				1u32.encode(), 4, None, 127, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(69, 1000))
+			).unwrap();
+			let i = Scheduler::do_schedule(
+				4, None, 127, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(42, 1000))
+			);
 			run_to_block(3);
 			assert!(logger::log().is_empty());
 			assert_ok!(Scheduler::do_cancel_named(1u32.encode()));
@@ -625,11 +634,17 @@ mod tests {
 	fn cancel_named_periodic_scheduling_works() {
 		new_test_ext().execute_with(|| {
 			// at #4, every 3 blocks, 3 times.
-			Scheduler::do_schedule_named(1u32.encode(), 4, Some((3, 3)), 127, Call::Logger(logger::Call::log(42, 1000))).unwrap();
+			Scheduler::do_schedule_named(
+				1u32.encode(), 4, Some((3, 3)), 127, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(42, 1000))
+			).unwrap();
 			// same id results in error.
-			assert!(Scheduler::do_schedule_named(1u32.encode(), 4, None, 127, Call::Logger(logger::Call::log(69, 1000))).is_err());
+			assert!(Scheduler::do_schedule_named(
+				1u32.encode(), 4, None, 127, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(69, 1000))
+			).is_err());
 			// different id is ok.
-			Scheduler::do_schedule_named(2u32.encode(), 8, None, 127, Call::Logger(logger::Call::log(69, 1000))).unwrap();
+			Scheduler::do_schedule_named(
+				2u32.encode(), 8, None, 127, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(69, 1000))
+			).unwrap();
 			run_to_block(3);
 			assert!(logger::log().is_empty());
 			run_to_block(4);
@@ -644,8 +659,12 @@ mod tests {
 	#[test]
 	fn scheduler_respects_weight_limits() {
 		new_test_ext().execute_with(|| {
-			Scheduler::do_schedule(4, None, 127, Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 2)));
-			Scheduler::do_schedule(4, None, 127, Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2)));
+			Scheduler::do_schedule(
+				4, None, 127, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 2))
+			);
+			Scheduler::do_schedule(
+				4, None, 127, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
+			);
 			// 69 and 42 do not fit together
 			run_to_block(4);
 			assert_eq!(logger::log(), vec![42u32]);
@@ -657,8 +676,12 @@ mod tests {
 	#[test]
 	fn scheduler_respects_hard_deadlines_more() {
 		new_test_ext().execute_with(|| {
-			Scheduler::do_schedule(4, None, 0, Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 2)));
-			Scheduler::do_schedule(4, None, 0, Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2)));
+			Scheduler::do_schedule(
+				4, None, 0, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 2))
+			);
+			Scheduler::do_schedule(
+				4, None, 0, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
+			);
 			// With base weights, 69 and 42 should not fit together, but do because of hard deadlines
 			run_to_block(4);
 			assert_eq!(logger::log(), vec![42u32, 69u32]);
@@ -668,8 +691,12 @@ mod tests {
 	#[test]
 	fn scheduler_respects_priority_ordering() {
 		new_test_ext().execute_with(|| {
-			Scheduler::do_schedule(4, None, 1, Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 2)));
-			Scheduler::do_schedule(4, None, 0, Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2)));
+			Scheduler::do_schedule(
+				4, None, 1, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 2))
+			);
+			Scheduler::do_schedule(
+				4, None, 0, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
+			);
 			run_to_block(4);
 			assert_eq!(logger::log(), vec![69u32, 42u32]);
 		});
@@ -678,9 +705,15 @@ mod tests {
 	#[test]
 	fn scheduler_respects_priority_ordering_with_soft_deadlines() {
 		new_test_ext().execute_with(|| {
-			Scheduler::do_schedule(4, None, 255, Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 3)));
-			Scheduler::do_schedule(4, None, 127, Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2)));
-			Scheduler::do_schedule(4, None, 126, Call::Logger(logger::Call::log(2600, MaximumSchedulerWeight::get() / 2)));
+			Scheduler::do_schedule(
+				4, None, 255, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 3))
+			);
+			Scheduler::do_schedule(
+				4, None, 127, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
+			);
+			Scheduler::do_schedule(
+				4, None, 126, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(2600, MaximumSchedulerWeight::get() / 2))
+			);
 
 			// 2600 does not fit with 69 or 42, but has higher priority, so will go through
 			run_to_block(4);
@@ -700,13 +733,21 @@ mod tests {
 			let periodic_multiplier = <Test as frame_system::Trait>::DbWeight::get().reads_writes(1, 1);
 
 			// Named
-			assert_ok!(Scheduler::do_schedule_named(1u32.encode(), 1, None, 255, Call::Logger(logger::Call::log(3, MaximumSchedulerWeight::get() / 3))));
+			assert_ok!(Scheduler::do_schedule_named(
+				1u32.encode(), 1, None, 255, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(3, MaximumSchedulerWeight::get() / 3)))
+			);
 			// Anon Periodic
-			Scheduler::do_schedule(1, Some((1000, 3)), 128, Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 3)));
+			Scheduler::do_schedule(
+				1, Some((1000, 3)), 128, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 3))
+			);
 			// Anon
-			Scheduler::do_schedule(1, None, 127, Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2)));
+			Scheduler::do_schedule(
+				1, None, 127, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
+			);
 			// Named Periodic
-			assert_ok!(Scheduler::do_schedule_named(2u32.encode(), 1, Some((1000, 3)), 126, Call::Logger(logger::Call::log(2600, MaximumSchedulerWeight::get() / 2))));
+			assert_ok!(Scheduler::do_schedule_named(
+				2u32.encode(), 1, Some((1000, 3)), 126, system::RawOrigin::Root.into(), Call::Logger(logger::Call::log(2600, MaximumSchedulerWeight::get() / 2)))
+			);
 
 			// Will include the named periodic only
 			let actual_weight = Scheduler::on_initialize(1);

frame/support/src/dispatch.rs

@@ -2171,14 +2171,16 @@ mod tests {
 	}
 
 	pub mod system {
+		use codec::{Encode, Decode};
+
 		pub trait Trait {
 			type AccountId;
 			type Call;
 			type BaseCallFilter;
 			type Origin: crate::traits::OriginTrait<Call = Self::Call>;
 		}
 
-		#[derive(Clone, PartialEq, Eq, Debug)]
+		#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
 		pub enum RawOrigin<AccountId> {
 			Root,
 			Signed(AccountId),

frame/support/src/metadata.rs

@@ -316,7 +316,7 @@ mod tests {
 			}
 		);
 
-		#[derive(Clone, PartialEq, Eq, Debug)]
+		#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
 		pub enum RawOrigin<AccountId> {
 			Root,
 			Signed(AccountId),

frame/support/src/origin.rs

@@ -332,15 +332,18 @@ macro_rules! impl_outer_origin {
 
 #[cfg(test)]
 mod tests {
+	use codec::{Encode, Decode};
 	use crate::traits::{Filter, OriginTrait};
 	mod system {
+		use super::*;
+
 		pub trait Trait {
 			type AccountId;
 			type Call;
 			type BaseCallFilter;
 		}
 
-		#[derive(Clone, PartialEq, Eq, Debug)]
+		#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
 		pub enum RawOrigin<AccountId> {
 			Root,
 			Signed(AccountId),
@@ -360,18 +363,22 @@ mod tests {
 	}
 
 	mod origin_without_generic {
-		#[derive(Clone, PartialEq, Eq, Debug)]
+		use super::*;
+
+		#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
 		pub struct Origin;
 	}
 
 	mod origin_with_generic {
-		#[derive(Clone, PartialEq, Eq, Debug)]
+		use super::*;
+
+		#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
 		pub struct Origin<T> {
 			t: T
 		}
 	}
 
-	#[derive(Clone, PartialEq, Eq, Debug)]
+	#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
 	pub struct TestRuntime;
 
 	pub struct BaseCallFilter;

frame/support/test/tests/instance.rs

@@ -17,6 +17,7 @@
 
 #![recursion_limit="128"]
 
+use codec::{Codec, EncodeLike, Encode, Decode};
 use sp_runtime::{generic, BuildStorage, traits::{BlakeTwo256, Block as _, Verify}};
 use frame_support::{
 	Parameter, traits::Get, parameter_types,
@@ -44,7 +45,7 @@ mod module1 {
 		type Event: From<Event<Self, I>> + Into<<Self as system::Trait>::Event>;
 		type Origin: From<Origin<Self, I>>;
 		type SomeParameter: Get<u32>;
-		type GenericType: Default + Clone + codec::Codec + codec::EncodeLike;
+		type GenericType: Default + Clone + Codec + EncodeLike;
 	}
 
 	frame_support::decl_module! {
@@ -87,7 +88,7 @@ mod module1 {
 		}
 	}
 
-	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug)]
+	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode)]
 	pub enum Origin<T: Trait<I>, I> where T::BlockNumber: From<u32> {
 		Members(u32),
 		_Phantom(std::marker::PhantomData<(T, I)>),
@@ -148,7 +149,7 @@ mod module2 {
 		}
 	}
 
-	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug)]
+	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode)]
 	pub enum Origin<T: Trait<I>, I=DefaultInstance> {
 		Members(u32),
 		_Phantom(std::marker::PhantomData<(T, I)>),

frame/support/test/tests/system.rs

@@ -57,7 +57,7 @@ frame_support::decl_error! {
 }
 
 /// Origin for the system module.
-#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode)]
 pub enum RawOrigin<AccountId> {
 	Root,
 	Signed(AccountId),