Skip to content

Commit

Permalink
fix integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
lemunozm committed Aug 30, 2023
1 parent a7ec39d commit 4ef0443
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use cfg_traits::{
};
use cfg_types::{
domain_address::{Domain, DomainAddress},
fixed_point::Rate,
fixed_point::{Quantity, Rate},
investments::InvestmentAccount,
orders::FulfillmentWithPrice,
permissions::{PermissionScope, PoolRole, Role, UNION},
Expand Down Expand Up @@ -1336,9 +1336,9 @@ fn inbound_collect_invest_order() {
assert_eq!(OrmlTokens::total_issuance(investment_currency_id), 0);
assert_ok!(Investments::invest_fulfillment(
investment_id(pool_id, default_tranche_id(pool_id)),
FulfillmentWithPrice::<Rate> {
FulfillmentWithPrice {
of_amount: Perquintill::one(),
price: Rate::one(),
price: Quantity::one(),
}
));
assert_eq!(OrmlTokens::total_issuance(investment_currency_id), amount);
Expand Down Expand Up @@ -1574,9 +1574,9 @@ fn inbound_collect_redeem_order() {
)));
assert_ok!(Investments::redeem_fulfillment(
investment_id(pool_id, default_tranche_id(pool_id)),
FulfillmentWithPrice::<Rate> {
FulfillmentWithPrice {
of_amount: Perquintill::one(),
price: Rate::one(),
price: Quantity::one(),
}
));

Expand Down Expand Up @@ -1705,7 +1705,7 @@ mod utils {
parents: 1,
interior: X1(Parachain(PARA_ID_MOONBEAM)),
};
pub type LiquidityPoolMessage = Message<Domain, PoolId, TrancheId, Balance, Rate>;
pub type LiquidityPoolMessage = Message<Domain, PoolId, TrancheId, Balance, Quantity>;

pub fn get_default_moonbeam_native_token_location() -> MultiLocation {
MultiLocation {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

use cfg_primitives::{Balance, PoolId, TrancheId, CFG};
use cfg_traits::liquidity_pools::OutboundQueue;
use cfg_types::{domain_address::Domain, fixed_point::Rate};
use cfg_types::{domain_address::Domain, fixed_point::Quantity};
use frame_support::{assert_ok, dispatch::RawOrigin, traits::fungible::Mutate};
use fudge::primitives::Chain;
use liquidity_pools_gateway_routers::{
Expand Down Expand Up @@ -125,7 +125,7 @@ async fn submit() {
mint_balance_into_derived_account(&mut env, axelar_contract_address, 1_000_000_000 * CFG);
mint_balance_into_derived_account(&mut env, sender_h160, 1_000_000 * CFG);

let msg = Message::<Domain, PoolId, TrancheId, Balance, Rate>::Transfer {
let msg = Message::<Domain, PoolId, TrancheId, Balance, Quantity>::Transfer {
currency: 0,
sender: Keyring::Alice.to_account_id().into(),
receiver: Keyring::Bob.to_account_id().into(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use cfg_primitives::{PoolId, TrancheId};
use cfg_traits::liquidity_pools::OutboundQueue;
use cfg_types::{
domain_address::Domain,
fixed_point::Rate,
fixed_point::Quantity,
tokens::{CrossChainTransferability, CurrencyId, CustomMetadata},
};
use frame_support::{assert_noop, assert_ok};
Expand Down Expand Up @@ -58,7 +58,7 @@ fn submit_test_fn(router_creation_fn: RouterCreationFn) {
Development::execute_with(|| {
setup(router_creation_fn);

let msg = Message::<Domain, PoolId, TrancheId, Balance, Rate>::Transfer {
let msg = Message::<Domain, PoolId, TrancheId, Balance, Quantity>::Transfer {
currency: 0,
sender: ALICE.into(),
receiver: BOB.into(),
Expand Down

0 comments on commit 4ef0443

Please sign in to comment.