diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 882a3b06a007..078f78933e22 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -49,10 +49,7 @@ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use beefy_primitives::crypto::AuthorityId as BeefyId; use frame_support::{ construct_runtime, parameter_types, - traits::{ - Contains, Everything, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, Nothing, - OnRuntimeUpgrade, - }, + traits::{Contains, Everything, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, Nothing}, weights::Weight, PalletId, RuntimeDebug, }; @@ -1496,22 +1493,11 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPallets, - MigratePalletVersionToStorageVersion, + (), >; /// The payload being signed in the transactions. pub type SignedPayload = generic::SignedPayload; -/// Migrate from `PalletVersion` to the new `StorageVersion` -pub struct MigratePalletVersionToStorageVersion; - -impl OnRuntimeUpgrade for MigratePalletVersionToStorageVersion { - fn on_runtime_upgrade() -> frame_support::weights::Weight { - frame_support::migrations::migrate_from_pallet_version_to_storage_version::< - AllPalletsWithSystem, - >(&RocksDbWeight::get()) - } -} - #[cfg(not(feature = "disable-runtime-api"))] sp_api::impl_runtime_apis! { impl sp_api::Core for Runtime { diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index b268b1b9e644..0b425170ec7d 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -31,7 +31,7 @@ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use beefy_primitives::crypto::AuthorityId as BeefyId; use frame_support::{ construct_runtime, parameter_types, - traits::{Contains, KeyOwnerProofSystem, LockIdentifier, OnRuntimeUpgrade}, + traits::{Contains, KeyOwnerProofSystem, LockIdentifier}, weights::Weight, PalletId, RuntimeDebug, }; @@ -1129,22 +1129,11 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPallets, - MigratePalletVersionToStorageVersion, + (), >; /// The payload being signed in transactions. pub type SignedPayload = generic::SignedPayload; -/// Migrate from `PalletVersion` to the new `StorageVersion` -pub struct MigratePalletVersionToStorageVersion; - -impl OnRuntimeUpgrade for MigratePalletVersionToStorageVersion { - fn on_runtime_upgrade() -> frame_support::weights::Weight { - frame_support::migrations::migrate_from_pallet_version_to_storage_version::< - AllPalletsWithSystem, - >(&RocksDbWeight::get()) - } -} - #[cfg(not(feature = "disable-runtime-api"))] sp_api::impl_runtime_apis! { impl sp_api::Core for Runtime { diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 9ed7da124844..5cb5d2b46512 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -24,9 +24,7 @@ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use beefy_primitives::{crypto::AuthorityId as BeefyId, mmr::MmrLeafVersion}; use frame_support::{ construct_runtime, parameter_types, - traits::{ - Contains, Everything, IsInVec, KeyOwnerProofSystem, Nothing, OnRuntimeUpgrade, Randomness, - }, + traits::{Contains, Everything, IsInVec, KeyOwnerProofSystem, Nothing, Randomness}, weights::Weight, PalletId, }; @@ -148,17 +146,6 @@ pub type SignedExtra = ( pallet_transaction_payment::ChargeTransactionPayment, ); -/// Migrate from `PalletVersion` to the new `StorageVersion` -pub struct MigratePalletVersionToStorageVersion; - -impl OnRuntimeUpgrade for MigratePalletVersionToStorageVersion { - fn on_runtime_upgrade() -> frame_support::weights::Weight { - frame_support::migrations::migrate_from_pallet_version_to_storage_version::< - AllPalletsWithSystem, - >(&RocksDbWeight::get()) - } -} - /// Unchecked extrinsic type as expected by this runtime. pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. @@ -168,7 +155,7 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPallets, - MigratePalletVersionToStorageVersion, + (), >; /// The payload being signed in transactions. pub type SignedPayload = generic::SignedPayload; diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index eec2d5706b75..6cda877838e3 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -58,9 +58,7 @@ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use beefy_primitives::crypto::AuthorityId as BeefyId; use frame_support::{ construct_runtime, parameter_types, - traits::{ - Contains, Everything, InstanceFilter, KeyOwnerProofSystem, Nothing, OnRuntimeUpgrade, - }, + traits::{Contains, Everything, InstanceFilter, KeyOwnerProofSystem, Nothing}, weights::Weight, PalletId, RuntimeDebug, }; @@ -1079,22 +1077,11 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPallets, - MigratePalletVersionToStorageVersion, + (), >; /// The payload being signed in transactions. pub type SignedPayload = generic::SignedPayload; -/// Migrate from `PalletVersion` to the new `StorageVersion` -pub struct MigratePalletVersionToStorageVersion; - -impl OnRuntimeUpgrade for MigratePalletVersionToStorageVersion { - fn on_runtime_upgrade() -> frame_support::weights::Weight { - frame_support::migrations::migrate_from_pallet_version_to_storage_version::< - AllPalletsWithSystem, - >(&RocksDbWeight::get()) - } -} - #[cfg(not(feature = "disable-runtime-api"))] sp_api::impl_runtime_apis! { impl sp_api::Core for Runtime {