From 2688e5387ba191d1dd1e1902fc35f8e5dfe1c5bf Mon Sep 17 00:00:00 2001
From: Martin Pugh <martin@parity.io>
Date: Tue, 10 Aug 2021 14:35:10 +0200
Subject: [PATCH] remove old migrations (#3609)
---
polkadot/runtime/kusama/src/lib.rs | 12 +-----------
polkadot/runtime/polkadot/src/lib.rs | 12 +-----------
polkadot/runtime/westend/src/lib.rs | 12 +-----------
3 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index fdbf7ccdecf..2cc4b889222 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -1485,7 +1485,7 @@ pub type Executive = frame_executive::Executive<
frame_system::ChainContext<Runtime>,
Runtime,
AllPallets,
- (RemoveCollectiveFlip, MigratePalletVersionToStorageVersion),
+ MigratePalletVersionToStorageVersion,
>;
/// The payload being signed in the transactions.
pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -1501,16 +1501,6 @@ impl OnRuntimeUpgrade for MigratePalletVersionToStorageVersion {
}
}
-pub struct RemoveCollectiveFlip;
-impl frame_support::traits::OnRuntimeUpgrade for RemoveCollectiveFlip {
- fn on_runtime_upgrade() -> Weight {
- use frame_support::storage::migration;
- // Remove the storage value `RandomMaterial` from removed pallet `RandomnessCollectiveFlip`
- migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b"");
- <Runtime as frame_system::Config>::DbWeight::get().writes(1)
- }
-}
-
#[cfg(not(feature = "disable-runtime-api"))]
sp_api::impl_runtime_apis! {
impl sp_api::Core<Block> for Runtime {
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index 3c84305bfdd..9eaf21440cf 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -1124,7 +1124,7 @@ pub type Executive = frame_executive::Executive<
frame_system::ChainContext<Runtime>,
Runtime,
AllPallets,
- (RemoveCollectiveFlip, MigratePalletVersionToStorageVersion),
+ MigratePalletVersionToStorageVersion,
>;
/// The payload being signed in transactions.
pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -1140,16 +1140,6 @@ impl OnRuntimeUpgrade for MigratePalletVersionToStorageVersion {
}
}
-pub struct RemoveCollectiveFlip;
-impl frame_support::traits::OnRuntimeUpgrade for RemoveCollectiveFlip {
- fn on_runtime_upgrade() -> Weight {
- use frame_support::storage::migration;
- // Remove the storage value `RandomMaterial` from removed pallet `RandomnessCollectiveFlip`
- migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b"");
- <Runtime as frame_system::Config>::DbWeight::get().writes(1)
- }
-}
-
#[cfg(not(feature = "disable-runtime-api"))]
sp_api::impl_runtime_apis! {
impl sp_api::Core<Block> for Runtime {
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 93fd23c48f0..54cdeed9013 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -1068,7 +1068,7 @@ pub type Executive = frame_executive::Executive<
frame_system::ChainContext<Runtime>,
Runtime,
AllPallets,
- (RemoveCollectiveFlip, MigratePalletVersionToStorageVersion),
+ MigratePalletVersionToStorageVersion,
>;
/// The payload being signed in transactions.
pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -1084,16 +1084,6 @@ impl OnRuntimeUpgrade for MigratePalletVersionToStorageVersion {
}
}
-pub struct RemoveCollectiveFlip;
-impl frame_support::traits::OnRuntimeUpgrade for RemoveCollectiveFlip {
- fn on_runtime_upgrade() -> Weight {
- use frame_support::storage::migration;
- // Remove the storage value `RandomMaterial` from removed pallet `RandomnessCollectiveFlip`
- migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b"");
- <Runtime as frame_system::Config>::DbWeight::get().writes(1)
- }
-}
-
#[cfg(not(feature = "disable-runtime-api"))]
sp_api::impl_runtime_apis! {
impl sp_api::Core<Block> for Runtime {
--
GitLab