renamed VersionCheckedMigrateToV5 to MigrateToV5 #2264

Signed-off-by: muraca <mmuraca247@gmail.com>
paritytech · Nov 10, 2023 · 27b91f9 · 27b91f9
1 parent e0afcb7
commit 27b91f9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs
@@ -723,7 +723,7 @@ type Migrations = (
 	import_kusama_fellowship::Migration<Runtime, FellowshipCollectiveInstance>,
 	// unreleased
 	pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,
-	pallet_collective::migrations::v5::VersionCheckedMigrateToV5<Runtime, AllianceCollective>,
+	pallet_collective::migrations::v5::MigrateToV5<Runtime, AllianceCollective>,
 );
 
 /// Executive: handles dispatch to the various modules.

diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
@@ -2189,9 +2189,9 @@ type Migrations = (
 	pallet_nomination_pools::migration::v2::MigrateToV2<Runtime>,
 	pallet_alliance::migration::Migration<Runtime>,
 	pallet_contracts::Migration<Runtime>,
-	pallet_collective::migrations::v5::VersionCheckedMigrateToV5<Runtime, CouncilCollective>,
-	pallet_collective::migrations::v5::VersionCheckedMigrateToV5<Runtime, TechnicalCollective>,
-	pallet_collective::migrations::v5::VersionCheckedMigrateToV5<Runtime, AllianceCollective>,
+	pallet_collective::migrations::v5::MigrateToV5<Runtime, CouncilCollective>,
+	pallet_collective::migrations::v5::MigrateToV5<Runtime, TechnicalCollective>,
+	pallet_collective::migrations::v5::MigrateToV5<Runtime, AllianceCollective>,
 );
 
 type EventRecord = frame_system::EventRecord<

diff --git a/substrate/frame/collective/src/migrations/v5.rs b/substrate/frame/collective/src/migrations/v5.rs
@@ -187,7 +187,7 @@ impl<T: Config<I>, I: 'static> OnRuntimeUpgrade for VersionUncheckedMigrateToV5<
 
 /// [`VersionUncheckedMigrateToV5`] wrapped in a [`frame_support::migrations::VersionedMigration`],
 /// ensuring the migration is only performed when on-chain version is 4.
-pub type VersionCheckedMigrateToV5<T, I> = frame_support::migrations::VersionedMigration<
+pub type MigrateToV5<T, I> = frame_support::migrations::VersionedMigration<
 	4,
 	5,
 	VersionUncheckedMigrateToV5<T, I>,

diff --git a/substrate/frame/collective/src/tests.rs b/substrate/frame/collective/src/tests.rs
@@ -1679,7 +1679,7 @@ fn migration_v5() {
 		v5::old::Voting::<Test, ()>::insert(proposal_hash, vote.clone());
 
 		// Run migration.
-		assert_ok!(v5::VersionCheckedMigrateToV5::<Test, ()>::try_on_runtime_upgrade(true));
+		assert_ok!(v5::MigrateToV5::<Test, ()>::try_on_runtime_upgrade(true));
 
 		// Check that the vote is present and bounded
 		assert_eq!(