From 033f208d34e2798d5ed25d4086df2333611897d3 Mon Sep 17 00:00:00 2001 From: s3krit Date: Tue, 3 Nov 2020 20:26:31 +0100 Subject: [PATCH] remove stale migrations (#1914) --- polkadot/runtime/kusama/src/lib.rs | 29 +--------------------------- polkadot/runtime/polkadot/src/lib.rs | 29 +--------------------------- 2 files changed, 2 insertions(+), 56 deletions(-) diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs index 14058a2bdc..0add25c1da 100644 --- a/polkadot/runtime/kusama/src/lib.rs +++ b/polkadot/runtime/kusama/src/lib.rs @@ -890,34 +890,7 @@ impl pallet_proxy::Trait for Runtime { pub struct CustomOnRuntimeUpgrade; impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn on_runtime_upgrade() -> frame_support::weights::Weight { - // Update scheduler origin usage - #[derive(Encode, Decode)] - #[allow(non_camel_case_types)] - pub enum OldOriginCaller { - system(frame_system::Origin), - pallet_collective_Instance1( - pallet_collective::Origin - ), - pallet_collective_Instance2( - pallet_collective::Origin - ), - } - - impl Into for OldOriginCaller { - fn into(self) -> OriginCaller { - match self { - OldOriginCaller::system(o) => OriginCaller::system(o), - OldOriginCaller::pallet_collective_Instance1(o) => - OriginCaller::pallet_collective_Instance1(o), - OldOriginCaller::pallet_collective_Instance2(o) => - OriginCaller::pallet_collective_Instance2(o), - } - } - } - - pallet_scheduler::Module::::migrate_origin::(); - - ::MaximumBlockWeight::get() + 0 } } diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs index f4ee569b2d..fe4baf3b9f 100644 --- a/polkadot/runtime/polkadot/src/lib.rs +++ b/polkadot/runtime/polkadot/src/lib.rs @@ -895,34 +895,7 @@ impl pallet_proxy::Trait for Runtime { pub struct CustomOnRuntimeUpgrade; impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn on_runtime_upgrade() -> frame_support::weights::Weight { - // Update scheduler origin usage - #[derive(Encode, Decode)] - #[allow(non_camel_case_types)] - pub enum OldOriginCaller { - system(frame_system::Origin), - pallet_collective_Instance1( - pallet_collective::Origin - ), - pallet_collective_Instance2( - pallet_collective::Origin - ), - } - - impl Into for OldOriginCaller { - fn into(self) -> OriginCaller { - match self { - OldOriginCaller::system(o) => OriginCaller::system(o), - OldOriginCaller::pallet_collective_Instance1(o) => - OriginCaller::pallet_collective_Instance1(o), - OldOriginCaller::pallet_collective_Instance2(o) => - OriginCaller::pallet_collective_Instance2(o), - } - } - } - - pallet_scheduler::Module::::migrate_origin::(); - - ::MaximumBlockWeight::get() + 0 } }