Revert "Companion PR for Allow specify schedule dispatch origin #6387" (

#1340)
paritytech · Jul 2, 2020 · ad6619d · ad6619d
1 parent 7826efe
commit ad6619d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 35 deletions.
diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs
@@ -333,7 +333,7 @@ pub trait Trait: CreateSignedTransaction<Call<Self>> + attestations::Trait + ses
 }
 
 /// Origin for the parachains module.
-#[derive(PartialEq, Eq, Clone, Encode, Decode)]
+#[derive(PartialEq, Eq, Clone)]
 #[cfg_attr(feature = "std", derive(Debug))]
 pub enum Origin {
 	/// It comes from a parachain.

diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
@@ -152,10 +152,8 @@ impl system::Trait for Runtime {
 impl scheduler::Trait for Runtime {
 	type Event = Event;
 	type Origin = Origin;
-	type PalletsOrigin = OriginCaller;
 	type Call = Call;
 	type MaximumWeight = MaximumBlockWeight;
-	type ScheduleOrigin = EnsureRoot<AccountId>;
 }
 
 parameter_types! {
@@ -375,7 +373,6 @@ impl democracy::Trait for Runtime {
 	type PreimageByteDeposit = PreimageByteDeposit;
 	type Slash = Treasury;
 	type Scheduler = Scheduler;
-	type PalletsOrigin = OriginCaller;
 	type MaxVotes = MaxVotes;
 	type OperationalPreimageOrigin = collective::EnsureMember<AccountId, CouncilCollective>;
 }
@@ -892,14 +889,10 @@ impl proxy::Trait for Runtime {
 }
 
 pub struct CustomOnRuntimeUpgrade;
-	impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
+impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 	fn on_runtime_upgrade() -> frame_support::weights::Weight {
 		treasury::Module::<Runtime>::migrate_retract_tip_for_tip_new();
-		if scheduler::Module::<Runtime>::migrate_v1_to_t2() {
-			<Runtime as system::Trait>::MaximumBlockWeight::get()
-		} else {
-			<Runtime as system::Trait>::DbWeight::get().reads(1) + 500_000_000
-		}
+		500_000_000
 	}
 }
 

diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
@@ -183,10 +183,8 @@ impl system::Trait for Runtime {
 impl scheduler::Trait for Runtime {
 	type Event = Event;
 	type Origin = Origin;
-	type PalletsOrigin = OriginCaller;
 	type Call = Call;
 	type MaximumWeight = MaximumBlockWeight;
-	type ScheduleOrigin = EnsureRoot<AccountId>;
 }
 
 parameter_types! {
@@ -444,7 +442,6 @@ impl democracy::Trait for Runtime {
 	type OperationalPreimageOrigin = collective::EnsureMember<AccountId, CouncilCollective>;
 	type Slash = Treasury;
 	type Scheduler = Scheduler;
-	type PalletsOrigin = OriginCaller;
 	type MaxVotes = MaxVotes;
 }
 
@@ -896,17 +893,6 @@ impl proxy::Trait for Runtime {
 	type MaxProxies = MaxProxies;
 }
 
-pub struct CustomOnRuntimeUpgrade;
-	impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
-	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		if scheduler::Module::<Runtime>::migrate_v1_to_t2() {
-			<Runtime as system::Trait>::MaximumBlockWeight::get()
-		} else {
-			<Runtime as system::Trait>::DbWeight::get().reads(1)
-		}
-	}
-}
-
 construct_runtime! {
 	pub enum Runtime where
 		Block = Block,
@@ -1004,14 +990,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signatu
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Nonce, Call>;
 /// Executive: handles dispatch to the various modules.
-pub type Executive = executive::Executive<
-	Runtime,
-	Block,
-	system::ChainContext<Runtime>,
-	Runtime,
-	AllModules,
-	CustomOnRuntimeUpgrade
->;
+pub type Executive = executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Runtime, AllModules>;
 /// The payload being signed in transactions.
 pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
 

diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
@@ -58,7 +58,6 @@ use im_online::sr25519::AuthorityId as ImOnlineId;
 use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
 use transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 use session::historical as session_historical;
-use system::EnsureRoot;
 
 #[cfg(feature = "std")]
 pub use staking::StakerStatus;
@@ -142,10 +141,8 @@ impl system::Trait for Runtime {
 impl scheduler::Trait for Runtime {
 	type Event = Event;
 	type Origin = Origin;
-	type PalletsOrigin = OriginCaller;
 	type Call = Call;
 	type MaximumWeight = MaximumBlockWeight;
-	type ScheduleOrigin = EnsureRoot<AccountId>;
 }
 
 parameter_types! {