From 8d36e9b0f0daa75b2a9adc3bfb1f644e2fa2d3ba Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Fri, 2 Oct 2020 16:45:04 +0200 Subject: [PATCH] Remove Stale Upgrades (#1780) * Remove stale upgrades * add back origin migration * remove unused --- polkadot/runtime/polkadot/src/lib.rs | 4 +--- polkadot/runtime/westend/src/lib.rs | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs index de2c774aa2..dd54513fdf 100644 --- a/polkadot/runtime/polkadot/src/lib.rs +++ b/polkadot/runtime/polkadot/src/lib.rs @@ -25,7 +25,7 @@ use runtime_common::{ impls::{CurrencyToVoteHandler, ToAuthor}, NegativeImbalance, BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, MaximumBlockLength, BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, - MaximumExtrinsicWeight, purchase, ParachainSessionKeyPlaceholder, + MaximumExtrinsicWeight, ParachainSessionKeyPlaceholder, }; use sp_std::prelude::*; @@ -902,8 +902,6 @@ impl pallet_proxy::Trait for Runtime { pub struct CustomOnRuntimeUpgrade; impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn on_runtime_upgrade() -> frame_support::weights::Weight { - purchase::remove_pallet::(); - // Update scheduler origin usage #[derive(Encode, Decode)] #[allow(non_camel_case_types)] diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs index 7d74b19009..57ac1542d1 100644 --- a/polkadot/runtime/westend/src/lib.rs +++ b/polkadot/runtime/westend/src/lib.rs @@ -28,7 +28,7 @@ use primitives::v1::{ CommittedCandidateReceipt, PersistedValidationData, GroupRotationInfo, ValidationCode, }; use runtime_common::{ - purchase, SlowAdjustingFeeUpdate, + SlowAdjustingFeeUpdate, impls::{CurrencyToVoteHandler, ToAuthor}, BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, MaximumBlockLength, BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, MaximumExtrinsicWeight, @@ -741,7 +741,7 @@ pub type SignedPayload = generic::SignedPayload; pub struct CustomOnRuntimeUpgrade; impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn on_runtime_upgrade() -> frame_support::weights::Weight { - purchase::remove_pallet::() + 0 } }