diff --git a/runtime/common/src/migrations.rs b/runtime/common/src/migrations.rs index d436d39c0b..18f7cb8840 100644 --- a/runtime/common/src/migrations.rs +++ b/runtime/common/src/migrations.rs @@ -23,7 +23,7 @@ use frame_support::traits::PalletInfoAccess; use frame_support::weights::WeightMeter; use pallet_migrations::WeightInfo; use parity_scale_codec::Encode; -use sp_core::{parameter_types, twox_128, Get}; +use sp_core::{twox_128, Get}; use sp_io::{storage::clear_prefix, KillStorageResult}; use sp_runtime::SaturatedConversion; @@ -285,16 +285,6 @@ pub type SingleBlockMigrations = ( PermanentSingleBlockMigrations, ); -parameter_types! { - pub const DestinationAssetFeePerSecondStorageName: &'static str = "DestinationAssetFeePerSecond"; -} - /// List of common multiblock migrations to be executed by the pallet-migrations pallet. /// The migrations listed here are common to every moonbeam runtime. -pub type MultiBlockMigrations = ( - ResetStorage< - Runtime, - pallet_xcm_transactor::Pallet, - DestinationAssetFeePerSecondStorageName, - >, -); +pub type MultiBlockMigrations = (); diff --git a/runtime/moonbase/src/lib.rs b/runtime/moonbase/src/lib.rs index 36f8499d70..257dd7f447 100644 --- a/runtime/moonbase/src/lib.rs +++ b/runtime/moonbase/src/lib.rs @@ -1406,7 +1406,7 @@ impl cumulus_pallet_weight_reclaim::Config for Runtime { impl pallet_migrations::Config for Runtime { type RuntimeEvent = RuntimeEvent; #[cfg(not(feature = "runtime-benchmarks"))] - type Migrations = migrations::MultiBlockMigrationList; + type Migrations = migrations::MultiBlockMigrationList; #[cfg(feature = "runtime-benchmarks")] type Migrations = pallet_migrations::mock_helpers::MockedMigrations; type CursorMaxLen = ConstU32<65_536>; diff --git a/runtime/moonbase/src/migrations.rs b/runtime/moonbase/src/migrations.rs index 9aa582c9a0..ad35f1d231 100644 --- a/runtime/moonbase/src/migrations.rs +++ b/runtime/moonbase/src/migrations.rs @@ -36,8 +36,8 @@ pub type SingleBlockMigrations = ( /// List of multi block migrations to be executed by the pallet_migrations. #[cfg(not(feature = "runtime-benchmarks"))] -pub type MultiBlockMigrationList = ( +pub type MultiBlockMigrationList = ( // Common multiblock migrations applied on all Moonbeam runtimes - moonbeam_runtime_common::migrations::MultiBlockMigrations, + moonbeam_runtime_common::migrations::MultiBlockMigrations, // ... Moonbase specific multiblock migrations ); diff --git a/runtime/moonbeam/src/lib.rs b/runtime/moonbeam/src/lib.rs index da62b90f63..cd164e2de1 100644 --- a/runtime/moonbeam/src/lib.rs +++ b/runtime/moonbeam/src/lib.rs @@ -1406,7 +1406,7 @@ impl cumulus_pallet_weight_reclaim::Config for Runtime { impl pallet_migrations::Config for Runtime { type RuntimeEvent = RuntimeEvent; #[cfg(not(feature = "runtime-benchmarks"))] - type Migrations = migrations::MultiBlockMigrationList; + type Migrations = migrations::MultiBlockMigrationList; #[cfg(feature = "runtime-benchmarks")] type Migrations = pallet_migrations::mock_helpers::MockedMigrations; type CursorMaxLen = ConstU32<65_536>; diff --git a/runtime/moonbeam/src/migrations.rs b/runtime/moonbeam/src/migrations.rs index e190d817ce..9655e2c30f 100644 --- a/runtime/moonbeam/src/migrations.rs +++ b/runtime/moonbeam/src/migrations.rs @@ -36,8 +36,8 @@ pub type SingleBlockMigrations = ( /// List of multi block migrations to be executed by the pallet_migrations. #[cfg(not(feature = "runtime-benchmarks"))] -pub type MultiBlockMigrationList = ( +pub type MultiBlockMigrationList = ( // Common multiblock migrations applied on all Moonbeam runtimes - moonbeam_runtime_common::migrations::MultiBlockMigrations, + moonbeam_runtime_common::migrations::MultiBlockMigrations, // ... Moonbeam specific multiblock migrations ); diff --git a/runtime/moonriver/src/lib.rs b/runtime/moonriver/src/lib.rs index 254848c305..f900dfdcf2 100644 --- a/runtime/moonriver/src/lib.rs +++ b/runtime/moonriver/src/lib.rs @@ -1406,7 +1406,7 @@ impl cumulus_pallet_weight_reclaim::Config for Runtime { impl pallet_migrations::Config for Runtime { type RuntimeEvent = RuntimeEvent; #[cfg(not(feature = "runtime-benchmarks"))] - type Migrations = migrations::MultiBlockMigrationList; + type Migrations = migrations::MultiBlockMigrationList; #[cfg(feature = "runtime-benchmarks")] type Migrations = pallet_migrations::mock_helpers::MockedMigrations; type CursorMaxLen = ConstU32<65_536>; diff --git a/runtime/moonriver/src/migrations.rs b/runtime/moonriver/src/migrations.rs index 49c8541d7f..7ee1f4a3a4 100644 --- a/runtime/moonriver/src/migrations.rs +++ b/runtime/moonriver/src/migrations.rs @@ -36,8 +36,8 @@ pub type SingleBlockMigrations = ( /// List of multi block migrations to be executed by the pallet_migrations. #[cfg(not(feature = "runtime-benchmarks"))] -pub type MultiBlockMigrationList = ( +pub type MultiBlockMigrationList = ( // Common multiblock migrations applied on all Moonbeam runtimes - moonbeam_runtime_common::migrations::MultiBlockMigrations, + moonbeam_runtime_common::migrations::MultiBlockMigrations, // ... Moonriver specific multiblock migrations );