Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions runtime/common/src/migrations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -285,16 +285,6 @@ pub type SingleBlockMigrations<Runtime> = (
PermanentSingleBlockMigrations<Runtime>,
);

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<Runtime> = (
ResetStorage<
Runtime,
pallet_xcm_transactor::Pallet<Runtime>,
DestinationAssetFeePerSecondStorageName,
>,
);
pub type MultiBlockMigrations = ();
2 changes: 1 addition & 1 deletion runtime/moonbase/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Runtime>;
type Migrations = migrations::MultiBlockMigrationList;
#[cfg(feature = "runtime-benchmarks")]
type Migrations = pallet_migrations::mock_helpers::MockedMigrations;
type CursorMaxLen = ConstU32<65_536>;
Expand Down
4 changes: 2 additions & 2 deletions runtime/moonbase/src/migrations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ pub type SingleBlockMigrations<Runtime> = (

/// List of multi block migrations to be executed by the pallet_migrations.
#[cfg(not(feature = "runtime-benchmarks"))]
pub type MultiBlockMigrationList<Runtime> = (
pub type MultiBlockMigrationList = (
// Common multiblock migrations applied on all Moonbeam runtimes
moonbeam_runtime_common::migrations::MultiBlockMigrations<Runtime>,
moonbeam_runtime_common::migrations::MultiBlockMigrations,
// ... Moonbase specific multiblock migrations
);
2 changes: 1 addition & 1 deletion runtime/moonbeam/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Runtime>;
type Migrations = migrations::MultiBlockMigrationList;
#[cfg(feature = "runtime-benchmarks")]
type Migrations = pallet_migrations::mock_helpers::MockedMigrations;
type CursorMaxLen = ConstU32<65_536>;
Expand Down
4 changes: 2 additions & 2 deletions runtime/moonbeam/src/migrations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ pub type SingleBlockMigrations<Runtime> = (

/// List of multi block migrations to be executed by the pallet_migrations.
#[cfg(not(feature = "runtime-benchmarks"))]
pub type MultiBlockMigrationList<Runtime> = (
pub type MultiBlockMigrationList = (
// Common multiblock migrations applied on all Moonbeam runtimes
moonbeam_runtime_common::migrations::MultiBlockMigrations<Runtime>,
moonbeam_runtime_common::migrations::MultiBlockMigrations,
// ... Moonbeam specific multiblock migrations
);
2 changes: 1 addition & 1 deletion runtime/moonriver/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Runtime>;
type Migrations = migrations::MultiBlockMigrationList;
#[cfg(feature = "runtime-benchmarks")]
type Migrations = pallet_migrations::mock_helpers::MockedMigrations;
type CursorMaxLen = ConstU32<65_536>;
Expand Down
4 changes: 2 additions & 2 deletions runtime/moonriver/src/migrations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ pub type SingleBlockMigrations<Runtime> = (

/// List of multi block migrations to be executed by the pallet_migrations.
#[cfg(not(feature = "runtime-benchmarks"))]
pub type MultiBlockMigrationList<Runtime> = (
pub type MultiBlockMigrationList = (
// Common multiblock migrations applied on all Moonbeam runtimes
moonbeam_runtime_common::migrations::MultiBlockMigrations<Runtime>,
moonbeam_runtime_common::migrations::MultiBlockMigrations,
// ... Moonriver specific multiblock migrations
);
Loading