working towards benchmarking

Author: Krayt78

substrate/frame/indices/Cargo.toml

@@ -21,6 +21,7 @@ frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 log = { workspace = true }
+pallet-balances = { optional = true, workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }

substrate/frame/indices/src/benchmarking.rs

@@ -23,12 +23,21 @@ use crate::*;
 use frame_benchmarking::v2::*;
 use frame_support::traits::Get;
 use frame_system::RawOrigin;
+use frame_support::traits::{Currency, ReservableCurrency};
 
 const SEED: u32 = 0;
 
-#[benchmarks]
+#[benchmarks(
+	where
+		T::NativeBalance: frame_support::traits::fungible::Inspect<T::AccountId>,
+		T: Config + pallet_balances::Config,
+		pallet_balances::Pallet<T>: Currency<T::AccountId, Balance = BalanceOf<T>> + ReservableCurrency<T::AccountId>,
+)]
 mod benchmarks {
 	use super::*;
+	use crate::migration::v1::MigrateCurrencyToFungibles;
+	use frame_support::weights::WeightMeter;
+	use frame_support::migrations::SteppedMigration;
 
 	#[benchmark]
 	fn claim() {
@@ -204,7 +213,7 @@ mod benchmarks {
 		let old_deposit = T::Deposit::get();
 		#[block]
 		{
-			MigrateCurrencyToFungibles::<T>::migrate_account(account, index, frozen, old_deposit);
+			let _ = MigrateCurrencyToFungibles::<T, pallet_balances::Pallet<T>>::step(None, &mut WeightMeter::new());
 		}
 		assert_eq!(Accounts::<T>::get(index).unwrap().0, account);
 		assert_eq!(Accounts::<T>::get(index).unwrap().1, old_deposit);

substrate/frame/indices/src/migration/v1/mod.rs

@@ -80,22 +80,28 @@ use crate::{
 	pallet::{Accounts, Config, HoldReason},
 	BalanceOf,
 };
-use alloc::collections::BTreeMap;
+
 use frame_support::{
 	migrations::{MigrationId, SteppedMigration, SteppedMigrationError},
 	pallet_prelude::PhantomData,
 	traits::{
-		fungible::{Inspect, InspectHold, MutateHold},
+		fungible::{Inspect, MutateHold},
 		tokens::{Fortitude, Preservation},
 		Currency, Get, ReservableCurrency,
 	},
 	weights::WeightMeter,
 };
-use sp_runtime::{traits::Zero, TryRuntimeError};
+use sp_runtime::traits::Zero;
 use std::cmp::min;
 
 #[cfg(feature = "try-runtime")]
 use alloc::vec::Vec;
+#[cfg(any(test, feature = "try-runtime"))]
+use alloc::collections::BTreeMap;
+#[cfg(any(test, feature = "try-runtime"))]
+use sp_runtime::TryRuntimeError;
+#[cfg(any(test, feature = "try-runtime"))]
+use frame_support::traits::fungible::InspectHold;
 
 // Module containing the OLD (v0) storage items that used Currency trait.
 pub mod v0 {
@@ -150,12 +156,6 @@ where
 			return Err(SteppedMigrationError::InsufficientWeight { required: min_required });
 		}
 
-		loop {
-			// Process one account per step
-			if meter.try_consume(min_required).is_err() {
-				break;
-			}
-
 			// Get the iterator for the OLD accounts to migrate
 			let mut iter = if let Some(Some(last_key)) = cursor {
 				v0::OldAccounts::<T>::iter_from(v0::OldAccounts::<T>::hashed_key_for(last_key))
@@ -172,7 +172,8 @@ where
 				println!("Migration completed - no more accounts to migrate");
 				return Ok(None);
 			}
-		}
+
+			meter.consume(min_required);
 
 		Ok(cursor)
 	}
@@ -254,7 +255,12 @@ where
 
 		Ok(())
 	}
+}
 
+impl<T: Config, OldCurrency> MigrateCurrencyToFungibles<T, OldCurrency>
+where
+	OldCurrency: Currency<T::AccountId, Balance = BalanceOf<T>> + ReservableCurrency<T::AccountId>,
+{
 	fn migrate_account(
 		account: T::AccountId,
 		index: T::AccountIndex,