From ee49329495c35d01e78d392601b4541d0e25c3ca Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 26 Jun 2023 02:19:55 +0400 Subject: [PATCH] add pallet_im_online::migration to Unreleased migrations (#7387) * add pallet_im_online::migration to Unreleased migrations refs https://github.com/paritytech/polkadot/pull/7309#issuecomment-1593030554 * ".git/.scripts/commands/fmt/fmt.sh" --------- Co-authored-by: command-bot <> --- runtime/kusama/src/lib.rs | 6 ++++-- runtime/parachains/src/configuration/migration_ump.rs | 10 ++-------- runtime/polkadot/src/lib.rs | 2 +- runtime/rococo/src/lib.rs | 5 ++++- runtime/westend/src/lib.rs | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 88d6b613f92f..c6e3bac29a2f 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1532,8 +1532,10 @@ pub mod migrations { ); /// Unreleased migrations. Add new ones here: - pub type Unreleased = - (pallet_society::migrations::MigrateToV2,); + pub type Unreleased = ( + pallet_society::migrations::MigrateToV2, + pallet_im_online::migration::v1::Migration, + ); /// Migrations that set `StorageVersion`s we missed to set. pub struct SetStorageVersions; diff --git a/runtime/parachains/src/configuration/migration_ump.rs b/runtime/parachains/src/configuration/migration_ump.rs index c46f25108fa3..008a93142ee7 100644 --- a/runtime/parachains/src/configuration/migration_ump.rs +++ b/runtime/parachains/src/configuration/migration_ump.rs @@ -107,18 +107,12 @@ pub mod latest { "There must be exactly one new pending upgrade enqueued" ); if let Err(err) = last.1.check_consistency() { - log::error!( - target: LOG_TARGET, - "Last PendingConfig is invalidity {:?}", err, - ); + log::error!(target: LOG_TARGET, "Last PendingConfig is invalidity {:?}", err,); return Err("Pending upgrade must be sane but was not".into()) } if let Err(err) = ActiveConfig::::get().check_consistency() { - log::error!( - target: LOG_TARGET, - "ActiveConfig is invalid: {:?}", err, - ); + log::error!(target: LOG_TARGET, "ActiveConfig is invalid: {:?}", err,); return Err("Active upgrade must be sane but was not".into()) } diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 3ebccf5a94f4..0cdc6785e746 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1522,7 +1522,7 @@ pub mod migrations { ); /// Unreleased migrations. Add new ones here: - pub type Unreleased = (); + pub type Unreleased = (pallet_im_online::migration::v1::Migration,); /// Migrations that set `StorageVersion`s we missed to set. pub struct SetStorageVersions; diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 68528fa8e7d3..833a1bdf4dec 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -1623,7 +1623,10 @@ pub mod migrations { } /// Unreleased migrations. Add new ones here: - pub type Unreleased = (pallet_society::migrations::MigrateToV2,); + pub type Unreleased = ( + pallet_society::migrations::MigrateToV2, + pallet_im_online::migration::v1::Migration, + ); } /// Helpers to configure all migrations. diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index eb1d25e37014..411f21f13841 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -1323,7 +1323,7 @@ pub mod migrations { } /// Unreleased migrations. Add new ones here: - pub type Unreleased = (); + pub type Unreleased = (pallet_im_online::migration::v1::Migration,); } /// Helpers to configure all migrations.