fix migration (paritytech/polkadot-sdk#1969)

svyatonik · Nov 13, 2023 · 4171d8b · 4171d8b
1 parent 4420a47
commit 4171d8b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 447 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,15 +52,15 @@ TODO for bridging: port https://github.com/paritytech/polkadot-sdk/pull/2023/fil
 - [x] **ADDED MIGRATION** [NPoS] Fix for Reward Deficit in the pool (#1255 @Ank4n) [Pallets]
 - [x] (INTERNAL) frame-support: RuntimeDebug\Eq\PartialEq impls for Imbalance (#1717 @muharem) [Frame]
 - [x] **ADDED MIGRATION** Tvl pool staking (#1322 @PieWol) [Frame]
-- [ ] **TODO: do the same for fellowship SP?** Init System Parachain storage versions and add migration check jobs to CI (#1344 @liamaharon) [Frame]
+- [X] **Could be added later (ping author)** Init System Parachain storage versions and add migration check jobs to CI (#1344 @liamaharon) [Frame]
 - [x] (INTERNAL) expose the last relay chain block number as an API from parachain-system (#1761 @rphmeier) [Pallets]
 - [x] (INTERNAL) feat: compute pallet/storage prefix hash at compile time (#1539 @yjhmelody) [Frame]
-- [ ] **TODO: do the same for fellowship SP?** Treasury spends various asset kinds (#1333 @muharem) [Frame]
+- [ ] **Could be added later (ping author)** Treasury spends various asset kinds (#1333 @muharem) [Frame]
 - [x] (INTERNAL) Make CheckNonce refuse transactions signed by accounts with no providers (#1578 @zdave-parity) [Frame]
 - [x] (INTERNAL) Warn on unchecked weight witness (#1818 @ggwpez) [Frame]
 - [x] (INTERNAL) frame: use derive-impl for beefy and mmr pallets (#1867 @acatangiu) [Pallets]
 - [x] (INTERNAL) Macros to use path instead of ident (#1474 @juangirini) [Frame]
-- [ ] **TODO: no migration required?** Refactor staking ledger (#1484 @gpestana) [Frame, Pallets]
+- [X] **descr saids that no migration required** Refactor staking ledger (#1484 @gpestana) [Frame, Pallets]
 - [x] (INTERNAL) extract amount method for fungible/s Imbalance (#1847 @muharem) [Frame]
 - [x] (INTERNAL) Allow Locks/Holds/Reserves/Freezes by default when using pallet_balances TestDefaultConfig (#1880 @liamaharon) [Frame, Pallets]
 - [x] (INTERNAL) nit: use traits::tokens::fungible => use traits::fungible (#1753 @gilescope) [Pallets]

diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs
@@ -121,8 +121,6 @@ mod weights;
 // Voter bag threshold definitions.
 mod bag_thresholds;
 
-// mod paras_scheduler_migration; // TODO: has it happened?
-
 // Historical information of society finances.
 mod past_payouts;
 
@@ -1795,7 +1793,7 @@ pub mod migrations {
 		>,
 		pallet_im_online::migration::v1::Migration<Runtime>,
 		parachains_configuration::migration::v7::MigrateToV7<Runtime>,
-		// paras_scheduler_migration::v1::MigrateToV1<Runtime>, TODO: has it happened?
+		runtime_parachains::scheduler::migration::v1::MigrateToV1<Runtime>,
 		parachains_configuration::migration::v8::MigrateToV8<Runtime>,
 
 		// Unlock/unreserve balances from Gov v1 pallets that hold them
@@ -2573,7 +2571,10 @@ mod fees_tests {
 #[cfg(test)]
 mod multiplier_tests {
 	use super::*;
-	use frame_support::{dispatch::DispatchInfo, traits::{OnFinalize, PalletInfoAccess}};
+	use frame_support::{
+		dispatch::DispatchInfo,
+		traits::{OnFinalize, PalletInfoAccess},
+	};
 	use runtime_common::{MinimumMultiplier, TargetBlockFullness};
 	use separator::Separatable;
 	use sp_runtime::traits::Convert;

diff --git a/relay/kusama/src/paras_scheduler_migration.rs b/relay/kusama/src/paras_scheduler_migration.rs
diff --git a/relay/polkadot/src/lib.rs b/relay/polkadot/src/lib.rs
@@ -119,8 +119,6 @@ mod weights;
 
 mod bag_thresholds;
 
-// mod paras_scheduler_migration; // TODO: has it happened?
-
 // Governance configurations.
 pub mod governance;
 use governance::{
@@ -1631,7 +1629,7 @@ pub mod migrations {
 	pub type Unreleased = (
 		pallet_im_online::migration::v1::Migration<Runtime>,
 		parachains_configuration::migration::v7::MigrateToV7<Runtime>,
-		// crate::paras_scheduler_migration::v1::MigrateToV1<Runtime>, // TODO: has it happened?
+		runtime_parachains::scheduler::migration::v1::MigrateToV1<Runtime>,
 		parachains_configuration::migration::v8::MigrateToV8<Runtime>,
 
 		// Gov v1 storage migrations
@@ -2542,7 +2540,10 @@ mod test {
 #[cfg(test)]
 mod multiplier_tests {
 	use super::*;
-	use frame_support::{dispatch::DispatchInfo, traits::OnFinalize};
+	use frame_support::{
+		dispatch::DispatchInfo,
+		traits::{OnFinalize, PalletInfoAccess},
+	};
 	use runtime_common::{MinimumMultiplier, TargetBlockFullness};
 	use scale_info::TypeInfo;
 	use separator::Separatable;