From c87eba6c96fbba0309a1bb012ca690ad8d49a0c2 Mon Sep 17 00:00:00 2001 From: William Freudenberger Date: Fri, 9 Aug 2024 13:59:56 +0200 Subject: [PATCH] fix: unwanted nesting + fmt --- runtime/altair/src/migrations.rs | 14 ++++---------- runtime/common/src/migrations/permissions_v1.rs | 2 +- runtime/development/src/migrations.rs | 14 ++++---------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/runtime/altair/src/migrations.rs b/runtime/altair/src/migrations.rs index 6d7950c6f4..c405dda164 100644 --- 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, - ::DbWeight, + runtime_common::migrations::permissions_v1::Migration< + Runtime, + crate::MinDelay, + crate::MaxTranches, >, pallet_permissions::Pallet, ::DbWeight, diff --git a/runtime/common/src/migrations/permissions_v1.rs b/runtime/common/src/migrations/permissions_v1.rs index 17831042a2..df0ab7da26 100644 --- 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 index 2fd87478f0..257c6e8915 100644 --- 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, - ::DbWeight, + runtime_common::migrations::permissions_v1::Migration< + Runtime, + crate::MinDelay, + crate::MaxTranches, >, pallet_permissions::Pallet, ::DbWeight,