From 7b04630a92bcc734433930a6b015f68c3cb80e11 Mon Sep 17 00:00:00 2001 From: Ankan Date: Thu, 28 Nov 2024 02:11:01 +0100 Subject: [PATCH] fix e2e tests --- .../test-staking-e2e/src/lib.rs | 10 +++++----- .../test-staking-e2e/src/mock.rs | 7 +------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs index af9f4d844ab9b..b1029e89fe85f 100644 --- a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs +++ b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs @@ -327,8 +327,8 @@ fn automatic_unbonding_pools() { assert_eq!(::MaxUnbonding::get(), 1); // init state of pool members. - let init_stakeable_balance_2 = stakeable_balance_for(2); - let init_stakeable_balance_3 = stakeable_balance_for(3); + let init_free_balance_2 = Balances::free_balance(2); + let init_free_balance_3 = Balances::free_balance(3); let pool_bonded_account = Pools::generate_bonded_account(1); @@ -410,7 +410,7 @@ fn automatic_unbonding_pools() { assert_ok!(Pools::withdraw_unbonded(RuntimeOrigin::signed(2), 2, 10)); assert_eq!(delegated_balance_for(pool_bonded_account), 15); - assert_eq!(stakeable_balance_for(2), 20); + assert_eq!(Balances::free_balance(2), 20); assert_eq!(TotalValueLocked::::get(), 15); // 3 cannot withdraw yet. @@ -430,8 +430,8 @@ fn automatic_unbonding_pools() { // final conditions are the expected. assert_eq!(delegated_balance_for(pool_bonded_account), 5); // 5 init bonded - assert_eq!(stakeable_balance_for(2), init_stakeable_balance_2); - assert_eq!(stakeable_balance_for(3), init_stakeable_balance_3); + assert_eq!(Balances::free_balance(2), init_free_balance_2); + assert_eq!(Balances::free_balance(3), init_free_balance_3); assert_eq!(TotalValueLocked::::get(), init_tvl); }); diff --git a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs index 59b8fadfecb7d..bcb25f8287b35 100644 --- a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs +++ b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs @@ -523,7 +523,7 @@ impl Default for BalancesExtBuilder { (100, 100), (200, 100), // stashes - (11, 1000), + (11, 1100), (21, 2000), (31, 3000), (41, 4000), @@ -954,11 +954,6 @@ pub(crate) fn delegated_balance_for(account_id: AccountId) -> Balance { DelegatedStaking::agent_balance(Agent::from(account_id)).unwrap_or_default() } -/// Balance available to be staked for an account. -pub(crate) fn stakeable_balance_for(account_id: AccountId) -> Balance { - pallet_staking::asset::stakeable_balance::(&account_id) -} - pub(crate) fn staking_events() -> Vec> { System::events() .into_iter()