From d44ca37e1016d1f34796a9b419fe2579581e0d1f Mon Sep 17 00:00:00 2001 From: lemunozm Date: Wed, 24 Jul 2024 11:34:35 +0200 Subject: [PATCH] fix benchmarks --- pallets/investments/src/benchmarking.rs | 2 +- pallets/pool-registry/src/benchmarking.rs | 17 ++++++----------- pallets/pool-system/src/benchmarking.rs | 13 ++++++------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/pallets/investments/src/benchmarking.rs b/pallets/investments/src/benchmarking.rs index 039e72a571..61be489504 100644 --- a/pallets/investments/src/benchmarking.rs +++ b/pallets/investments/src/benchmarking.rs @@ -39,7 +39,7 @@ where #[cfg(test)] crate::mock::MockAccountant::mock_bench_default_investment_id(|_| { - crate::mock::InvestmentId::default() + cfg_primitives::InvestmentId::default() }); T::Accountant::bench_create_funded_pool(pool_id, &pool_admin); diff --git a/pallets/pool-registry/src/benchmarking.rs b/pallets/pool-registry/src/benchmarking.rs index fe9b1444c6..bc4b8b2a8e 100644 --- a/pallets/pool-registry/src/benchmarking.rs +++ b/pallets/pool-registry/src/benchmarking.rs @@ -13,13 +13,8 @@ //! Module provides benchmarking for Loan Pallet use cfg_primitives::PoolEpochId; -use cfg_traits::{ - benchmarking::PoolFeesBenchmarkHelper, fee::PoolFeeBucket, investments::TrancheCurrency as _, -}; -use cfg_types::{ - pools::TrancheMetadata, - tokens::{CurrencyId, TrancheCurrency}, -}; +use cfg_traits::{benchmarking::PoolFeesBenchmarkHelper, fee::PoolFeeBucket}; +use cfg_types::{pools::TrancheMetadata, tokens::CurrencyId}; use frame_benchmarking::benchmarks; use frame_support::traits::fungibles::Inspect; use frame_system::RawOrigin; @@ -61,7 +56,7 @@ benchmarks! { + pallet_investments::Config, + CurrencyId = CurrencyId> + pallet_investments::Config, T: pallet_pool_system::Config(0, TRANCHE, Some(amount))?; let locator = get_tranche_id::(TRANCHE); - pallet_investments::Pallet::::update_redeem_order(RawOrigin::Signed(investor.clone()).into(), TrancheCurrency::generate(POOL, locator), amount)?; + pallet_investments::Pallet::::update_redeem_order(RawOrigin::Signed(investor.clone()).into(), (POOL, locator), amount)?; let changes = PoolChanges { @@ -202,12 +197,12 @@ benchmarks! { let investor = create_investor::(0, TRANCHE, Some(1))?; let locator = get_tranche_id::(TRANCHE); // Submit redemption order so the update isn't immediately executed - pallet_investments::Pallet::::update_redeem_order(RawOrigin::Signed(investor.clone()).into(), TrancheCurrency::generate(POOL, locator), 1)?; + pallet_investments::Pallet::::update_redeem_order(RawOrigin::Signed(investor.clone()).into(), (POOL, locator), 1)?; update_pool::(changes.clone())?; // Withdraw redeem order so the update can be executed after that - pallet_investments::Pallet::::update_redeem_order(RawOrigin::Signed(investor.clone()).into(), TrancheCurrency::generate(POOL, locator), 0)?; + pallet_investments::Pallet::::update_redeem_order(RawOrigin::Signed(investor.clone()).into(), (POOL, locator), 0)?; }: execute_update(RawOrigin::Signed(admin), POOL) verify { let pool = get_pool::(); diff --git a/pallets/pool-system/src/benchmarking.rs b/pallets/pool-system/src/benchmarking.rs index 086a24cd45..8164ffced5 100644 --- a/pallets/pool-system/src/benchmarking.rs +++ b/pallets/pool-system/src/benchmarking.rs @@ -16,12 +16,11 @@ use cfg_primitives::PoolEpochId; use cfg_traits::{ benchmarking::PoolFeesBenchmarkHelper, fee::{PoolFeeBucket, PoolFeesInspect}, - investments::TrancheCurrency as _, UpdateState, }; use cfg_types::{ pools::{PoolFeeInfo, TrancheMetadata}, - tokens::{CurrencyId, CustomMetadata, TrancheCurrency}, + tokens::{CurrencyId, CustomMetadata}, }; use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite}; use frame_support::traits::Currency; @@ -54,7 +53,7 @@ benchmarks! { Balance = u128, CurrencyId = CurrencyId, EpochId = PoolEpochId> - + pallet_investments::Config, + + pallet_investments::Config, ::Tokens: Inspect, T::AccountId: EncodeLike<::AccountId>, <::Lookup as sp_runtime::traits::StaticLookup>::Source: @@ -109,7 +108,7 @@ benchmarks! { let investment = MAX_RESERVE * 2; let investor = create_investor::(0, TRANCHE, None)?; let origin = RawOrigin::Signed(investor.clone()).into(); - pallet_investments::Pallet::::update_invest_order(origin, TrancheCurrency::generate(POOL, get_tranche_id::(TRANCHE)), investment)?; + pallet_investments::Pallet::::update_invest_order(origin, (POOL, get_tranche_id::(TRANCHE)), investment)?; }: close_epoch(RawOrigin::Signed(admin.clone()), POOL) verify { assert_eq!(get_pool::().epoch.last_executed, 0); @@ -129,7 +128,7 @@ benchmarks! { let investment = MAX_RESERVE / 2; let investor = create_investor::(0, TRANCHE, None)?; let origin = RawOrigin::Signed(investor.clone()).into(); - pallet_investments::Pallet::::update_invest_order(origin, TrancheCurrency::generate(POOL, get_tranche_id::(TRANCHE)), investment)?; + pallet_investments::Pallet::::update_invest_order(origin, (POOL, get_tranche_id::(TRANCHE)), investment)?; }: close_epoch(RawOrigin::Signed(admin.clone()), POOL) verify { assert_eq!(get_pool::().epoch.last_executed, 1); @@ -149,7 +148,7 @@ benchmarks! { let investment = MAX_RESERVE * 2; let investor = create_investor::(0, TRANCHE, None)?; let origin = RawOrigin::Signed(investor.clone()).into(); - pallet_investments::Pallet::::update_invest_order(origin, TrancheCurrency::generate(POOL, get_tranche_id::(TRANCHE)), investment)?; + pallet_investments::Pallet::::update_invest_order(origin, (POOL, get_tranche_id::(TRANCHE)), investment)?; let admin_origin = RawOrigin::Signed(admin.clone()).into(); Pallet::::close_epoch(admin_origin, POOL)?; @@ -180,7 +179,7 @@ benchmarks! { let investment = MAX_RESERVE * 2; let investor = create_investor::(0, TRANCHE, None)?; let origin = RawOrigin::Signed(investor.clone()).into(); - pallet_investments::Pallet::::update_invest_order(origin, TrancheCurrency::generate(POOL, get_tranche_id::(TRANCHE)), investment)?; + pallet_investments::Pallet::::update_invest_order(origin, (POOL, get_tranche_id::(TRANCHE)), investment)?; let admin_origin = RawOrigin::Signed(admin.clone()).into(); Pallet::::close_epoch(admin_origin, POOL)?;