diff --git a/runtime/integration-tests/src/cases/lp/investments.rs b/runtime/integration-tests/src/cases/lp/investments.rs index f7199e15bc..2995c30ad7 100644 --- a/runtime/integration-tests/src/cases/lp/investments.rs +++ b/runtime/integration-tests/src/cases/lp/investments.rs @@ -296,6 +296,8 @@ mod with_pool_currency { env.state_mut(|evm| { utils::cancel(evm, Keyring::TrancheInvestor(1), names::POOL_C_T_1_USDC); + + lp_utils::process_gateway_message::(lp_utils::verify_gateway_message_success::); }); env.pass(Blocks::ByNumber(1)); diff --git a/runtime/integration-tests/src/cases/lp/pool_management.rs b/runtime/integration-tests/src/cases/lp/pool_management.rs index 17c9894909..48ada53f6f 100644 --- a/runtime/integration-tests/src/cases/lp/pool_management.rs +++ b/runtime/integration-tests/src/cases/lp/pool_management.rs @@ -11,7 +11,7 @@ // GNU General Public License for more details. use cfg_primitives::{AccountId, Balance, PoolId, SECONDS_PER_YEAR}; -use cfg_traits::{PoolMetadata, TimeAsSecs, TrancheTokenPrice}; +use cfg_traits::{PoolMetadata, TrancheTokenPrice}; use cfg_types::{ domain_address::{Domain, DomainAddress}, permissions::PoolRole, @@ -147,20 +147,16 @@ fn add_pool() { utils::process_gateway_message::(utils::verify_gateway_message_success::); - let creation_time = as TimeAsSecs>::now(); - - // Compare the pool.created_at field that is returned - let evm_pool_time = Decoder::::decode( + assert!(Decoder::::decode( &evm.view( Keyring::Alice, names::POOL_MANAGER, - "pools", + "isPoolActive", Some(&[Token::Uint(Uint::from(POOL))]), ) .unwrap() - .value, - ); - assert_eq!(evm_pool_time, Uint::from(creation_time)); + .value + )); }); env.state_mut(|evm| { @@ -564,27 +560,6 @@ fn update_tranche_token_price() { super::setup_tranches(evm); }); - // Neither price nor computed exists yet - env.state(|evm| { - let (price_evm, computed_evm) = Decoder::<(u128, u64)>::decode( - &evm.view( - Keyring::Alice, - names::POOL_MANAGER, - "getTranchePrice", - Some(&[ - Token::Uint(Uint::from(POOL_A)), - Token::FixedBytes(pool_a_tranche_1_id::().to_vec()), - Token::Address(evm.deployed(names::USDC).address()), - ]), - ) - .unwrap() - .value, - ); - - assert_eq!(price_evm, 0); - assert_eq!(computed_evm, 0); - }); - let (price, last_updated) = env.state_mut(|_evm| { let price = as TrancheTokenPrice>::get_price(