refactor: use public migration

centrifuge · Jun 6, 2024 · 952f8f6 · 952f8f6
1 parent 5b14f68
commit 952f8f6
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 122 deletions.
diff --git a/runtime/altair/src/migrations.rs b/runtime/altair/src/migrations.rs
@@ -23,7 +23,7 @@ pub type UpgradeAltair1035 = (
 	runtime_common::migrations::increase_storage_version::Migration<OrderBook, 0, 1>,
 	runtime_common::migrations::increase_storage_version::Migration<ForeignInvestments, 0, 1>,
 	pallet_collator_selection::migration::v1::MigrateToV1<crate::Runtime>,
-	runtime_common::migrations::collator_selection_v2::UncheckedMigrationToV2<crate::Runtime>,
+	pallet_collator_selection::migration::v2::MigrationToV2<crate::Runtime>,
 	runtime_common::migrations::loans::AddWithLinearPricing<crate::Runtime>,
 	// As of May 2024, the `pallet_balances::Hold` storage was empty. But better be safe.
 	runtime_common::migrations::hold_reason::MigrateTransferAllowListHolds<

diff --git a/runtime/centrifuge/src/migrations.rs b/runtime/centrifuge/src/migrations.rs
@@ -21,7 +21,7 @@ pub type UpgradeCentrifuge1029 = (
 	runtime_common::migrations::increase_storage_version::Migration<OraclePriceFeed, 0, 1>,
 	runtime_common::migrations::increase_storage_version::Migration<OraclePriceCollection, 0, 1>,
 	pallet_collator_selection::migration::v1::MigrateToV1<crate::Runtime>,
-	runtime_common::migrations::collator_selection_v2::UncheckedMigrationToV2<crate::Runtime>,
+	pallet_collator_selection::migration::v2::MigrationToV2<crate::Runtime>,
 	runtime_common::migrations::loans::AddWithLinearPricing<crate::Runtime>,
 	runtime_common::migrations::hold_reason::MigrateTransferAllowListHolds<
 		crate::Runtime,

diff --git a/runtime/common/src/migrations/collator_selection_v2.rs b/runtime/common/src/migrations/collator_selection_v2.rs
diff --git a/runtime/common/src/migrations/mod.rs b/runtime/common/src/migrations/mod.rs
@@ -12,7 +12,6 @@
 
 //! Centrifuge Runtime-Common Migrations
 
-pub mod collator_selection_v2;
 pub mod hold_reason;
 pub mod increase_storage_version;
 pub mod loans;

diff --git a/runtime/development/src/migrations.rs b/runtime/development/src/migrations.rs
@@ -23,7 +23,7 @@ const IDENTITY_MIGRATION_KEY_LIMIT: u64 = 1000;
 /// It includes all the migrations that have to be applied on that chain.
 pub type UpgradeDevelopment1047 = (
 	pallet_collator_selection::migration::v1::MigrateToV1<crate::Runtime>,
-	runtime_common::migrations::collator_selection_v2::UncheckedMigrationToV2<crate::Runtime>,
+	pallet_collator_selection::migration::v2::MigrationToV2<crate::Runtime>,
 	cleanup_foreign_investments::Migration<crate::Runtime>,
 	// v0 -> v1
 	pallet_multisig::migrations::v1::MigrateToV1<crate::Runtime>,