fix: unwanted nesting + fmt

centrifuge · Aug 9, 2024 · c87eba6 · c87eba6
1 parent 13451f5
commit c87eba6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 21 deletions.
diff --git a/runtime/altair/src/migrations.rs b/runtime/altair/src/migrations.rs
@@ -35,16 +35,10 @@ pub type UpgradeAltair1401 = (
 	frame_support::migrations::VersionedMigration<
 		0,
 		1,
-		frame_support::migrations::VersionedMigration<
-			0,
-			1,
-			runtime_common::migrations::permissions_v1::Migration<
-				Runtime,
-				crate::MinDelay,
-				crate::MaxTranches,
-			>,
-			pallet_permissions::Pallet<Runtime>,
-			<Runtime as frame_system::Config>::DbWeight,
+		runtime_common::migrations::permissions_v1::Migration<
+			Runtime,
+			crate::MinDelay,
+			crate::MaxTranches,
 		>,
 		pallet_permissions::Pallet<Runtime>,
 		<Runtime as frame_system::Config>::DbWeight,

diff --git a/runtime/common/src/migrations/permissions_v1.rs b/runtime/common/src/migrations/permissions_v1.rs
@@ -76,7 +76,7 @@ where
 				MaxTranches,
 			>,
 			_,
-		>(|role| Some(role.migrate().into()));
+		>(|role| Some(role.migrate()));
 
 		log::info!("{LOG_PREFIX}: Migrated {writes} permissions!");
 

diff --git a/runtime/development/src/migrations.rs b/runtime/development/src/migrations.rs
@@ -33,16 +33,10 @@ pub type UpgradeDevelopment1401 = (
 	frame_support::migrations::VersionedMigration<
 		0,
 		1,
-		frame_support::migrations::VersionedMigration<
-			0,
-			1,
-			runtime_common::migrations::permissions_v1::Migration<
-				Runtime,
-				crate::MinDelay,
-				crate::MaxTranches,
-			>,
-			pallet_permissions::Pallet<Runtime>,
-			<Runtime as frame_system::Config>::DbWeight,
+		runtime_common::migrations::permissions_v1::Migration<
+			Runtime,
+			crate::MinDelay,
+			crate::MaxTranches,
 		>,
 		pallet_permissions::Pallet<Runtime>,
 		<Runtime as frame_system::Config>::DbWeight,