From 982a6847ae99cf0ab54664ef12e37e7c8bdaab9b Mon Sep 17 00:00:00 2001
From: Anton <anton.kalyaev@gmail.com>
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 <>
---
polkadot/runtime/kusama/src/lib.rs | 6 ++++--
.../parachains/src/configuration/migration_ump.rs | 10 ++--------
polkadot/runtime/polkadot/src/lib.rs | 2 +-
polkadot/runtime/rococo/src/lib.rs | 5 ++++-
polkadot/runtime/westend/src/lib.rs | 2 +-
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index 88d6b613f92..c6e3bac29a2 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/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<Runtime, (), past_payouts::PastPayouts>,);
+ pub type Unreleased = (
+ pallet_society::migrations::MigrateToV2<Runtime, (), past_payouts::PastPayouts>,
+ pallet_im_online::migration::v1::Migration<Runtime>,
+ );
/// Migrations that set `StorageVersion`s we missed to set.
pub struct SetStorageVersions;
diff --git a/polkadot/runtime/parachains/src/configuration/migration_ump.rs b/polkadot/runtime/parachains/src/configuration/migration_ump.rs
index c46f25108fa..008a93142ee 100644
--- a/polkadot/runtime/parachains/src/configuration/migration_ump.rs
+++ b/polkadot/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::<T>::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/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index 3ebccf5a94f..0cdc6785e74 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/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<Runtime>,);
/// Migrations that set `StorageVersion`s we missed to set.
pub struct SetStorageVersions;
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index 68528fa8e7d..833a1bdf4de 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/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<Runtime, (), ()>,);
+ pub type Unreleased = (
+ pallet_society::migrations::MigrateToV2<Runtime, (), ()>,
+ pallet_im_online::migration::v1::Migration<Runtime>,
+ );
}
/// Helpers to configure all migrations.
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index eb1d25e3701..411f21f1384 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/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<Runtime>,);
}
/// Helpers to configure all migrations.
--
GitLab