Skip to content

Commit

Permalink
Integration test updated, Protocol 22 working
Browse files Browse the repository at this point in the history
  • Loading branch information
@joaquinsoza
joaquinsoza committed Dec 9, 2024
1 parent ea16fc1 commit fa460a6
Show file tree
Hide file tree
Showing 9 changed files with 786 additions and 758 deletions.
2 changes: 1 addition & 1 deletion apps/contracts/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SUBDIRS = strategies vault factory
SUBDIRS = strategies vault factory integration-test

default: build

Expand Down
7 changes: 5 additions & 2 deletions apps/contracts/integration-test/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
default: test
default: build

all: test

test:
test:
cargo test

build:
@echo "No need to build integration tests"

fmt:
cargo fmt --all --check

Expand Down
2 changes: 1 addition & 1 deletion apps/contracts/integration-test/src/test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ impl<'a> IntegrationTest<'a> {

// #[cfg(test)]
mod vault_one_hodl_strategy;
// mod vault_one_fixed_strategy;
mod vault_one_fixed_strategy;
12 changes: 8 additions & 4 deletions apps/contracts/integration-test/src/test/vault_one_fixed_strategy/deposit.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ fn fixed_apr_deposit_success() {
args: (
Vec::from_array(&setup.env,[deposit_amount]),
Vec::from_array(&setup.env,[deposit_amount]),
user.clone()
user.clone(),
false
).into_val(&setup.env),
sub_invokes: &[
MockAuthInvoke {
Expand Down Expand Up @@ -97,7 +98,8 @@ fn fixed_apr_deposit_insufficient_balance() {
args: (
Vec::from_array(&setup.env,[deposit_amount]),
Vec::from_array(&setup.env,[deposit_amount]),
user.clone()
user.clone(),
false
).into_val(&setup.env),
sub_invokes: &[
MockAuthInvoke {
Expand Down Expand Up @@ -161,7 +163,8 @@ fn fixed_apr_deposit_multiple_users() {
args: (
Vec::from_array(&setup.env,[deposit_amount]),
Vec::from_array(&setup.env,[deposit_amount]),
user1.clone()
user1.clone(),
false
).into_val(&setup.env),
sub_invokes: &[
MockAuthInvoke {
Expand All @@ -188,7 +191,8 @@ fn fixed_apr_deposit_multiple_users() {
args: (
Vec::from_array(&setup.env,[deposit_amount]),
Vec::from_array(&setup.env,[deposit_amount]),
user2.clone()
user2.clone(),
false
).into_val(&setup.env),
sub_invokes: &[
MockAuthInvoke {
Expand Down
245 changes: 124 additions & 121 deletions apps/contracts/integration-test/src/test/vault_one_fixed_strategy/withdraw.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ fn fixed_apr_no_invest_withdraw_success() {
args: (
Vec::from_array(&setup.env,[deposit_amount]),
Vec::from_array(&setup.env,[deposit_amount]),
user.clone()
user.clone(),
false
).into_val(&setup.env),
sub_invokes: &[
MockAuthInvoke {
Expand Down Expand Up @@ -85,126 +86,128 @@ fn fixed_apr_no_invest_withdraw_success() {

#[test]
fn fixed_apr_invest_withdraw_success() {
let enviroment = create_vault_one_asset_fixed_strategy();
let setup = enviroment.setup;

let user_starting_balance = 10_000_0_000_000i128;
let deposit_amount = 10_000_0_000_000i128;

let users = IntegrationTest::generate_random_users(&setup.env, 1);
let user = &users[0];

enviroment.token_admin_client.mock_auths(&[MockAuth {
address: &enviroment.token_admin.clone(),
invoke: &MockAuthInvoke {
contract: &enviroment.token.address.clone(),
fn_name: "mint",
args: (user, user_starting_balance,).into_val(&setup.env),
sub_invokes: &[],
},
}]).mint(user, &user_starting_balance);

enviroment.vault_contract.mock_auths(&[MockAuth {
address: &user.clone(),
invoke: &MockAuthInvoke {
contract: &enviroment.vault_contract.address.clone(),
fn_name: "deposit",
args: (
Vec::from_array(&setup.env,[deposit_amount]),
Vec::from_array(&setup.env,[deposit_amount]),
user.clone()
).into_val(&setup.env),
sub_invokes: &[
MockAuthInvoke {
contract: &enviroment.token.address.clone(),
fn_name: "transfer",
args: (
user.clone(),
&enviroment.vault_contract.address.clone(),
deposit_amount
).into_val(&setup.env),
sub_invokes: &[]
}
]
},
}])
.deposit(&svec![&setup.env, deposit_amount], &svec![&setup.env, deposit_amount], &user, &false);
todo!(); //TODO: Withdraw after invest not working Error #10 balance is not enough
// let enviroment = create_vault_one_asset_fixed_strategy();
// let setup = enviroment.setup;

// let user_starting_balance = 10_000_0_000_000i128;
// let deposit_amount = 10_000_0_000_000i128;

// let users = IntegrationTest::generate_random_users(&setup.env, 1);
// let user = &users[0];

// enviroment.token_admin_client.mock_auths(&[MockAuth {
// address: &enviroment.token_admin.clone(),
// invoke: &MockAuthInvoke {
// contract: &enviroment.token.address.clone(),
// fn_name: "mint",
// args: (user, user_starting_balance,).into_val(&setup.env),
// sub_invokes: &[],
// },
// }]).mint(user, &user_starting_balance);

// enviroment.vault_contract.mock_auths(&[MockAuth {
// address: &user.clone(),
// invoke: &MockAuthInvoke {
// contract: &enviroment.vault_contract.address.clone(),
// fn_name: "deposit",
// args: (
// Vec::from_array(&setup.env,[deposit_amount]),
// Vec::from_array(&setup.env,[deposit_amount]),
// user.clone(),
// false
// ).into_val(&setup.env),
// sub_invokes: &[
// MockAuthInvoke {
// contract: &enviroment.token.address.clone(),
// fn_name: "transfer",
// args: (
// user.clone(),
// &enviroment.vault_contract.address.clone(),
// deposit_amount
// ).into_val(&setup.env),
// sub_invokes: &[]
// }
// ]
// },
// }])
// .deposit(&svec![&setup.env, deposit_amount], &svec![&setup.env, deposit_amount], &user, &false);

// let investments = svec![
// &setup.env,
// Some(AssetInvestmentAllocation {
// asset: enviroment.token.address.clone(),
// strategy_allocations: svec![
// &setup.env,
// Some(StrategyAllocation {
// amount: deposit_amount,
// strategy_address: enviroment.strategy_contract.address.clone(),
// }),
// ],
// }),
// ];

// enviroment.vault_contract
// .mock_auths(&[MockAuth {
// address: &enviroment.manager.clone(),
// invoke: &MockAuthInvoke {
// contract: &enviroment.vault_contract.address.clone(),
// fn_name: "invest",
// args: (
// Vec::from_array(&setup.env,[
// Some(
// AssetInvestmentAllocation {
// asset: enviroment.token.address.clone(),
// strategy_allocations:
// svec![&setup.env,
// Some(StrategyAllocation {
// amount: deposit_amount,
// strategy_address: enviroment.strategy_contract.address.clone(),
// })
// ]
// }
// )
// ]),
// ).into_val(&setup.env),
// sub_invokes: &[]
// },
// }])
// .invest(&investments);

// setup.env.ledger().set_timestamp(setup.env.ledger().timestamp() + ONE_YEAR_IN_SECONDS);

let investments = svec![
&setup.env,
Some(AssetInvestmentAllocation {
asset: enviroment.token.address.clone(),
strategy_allocations: svec![
&setup.env,
Some(StrategyAllocation {
amount: deposit_amount,
strategy_address: enviroment.strategy_contract.address.clone(),
}),
],
}),
];

enviroment.vault_contract
.mock_auths(&[MockAuth {
address: &enviroment.manager.clone(),
invoke: &MockAuthInvoke {
contract: &enviroment.vault_contract.address.clone(),
fn_name: "invest",
args: (
Vec::from_array(&setup.env,[
Some(
AssetInvestmentAllocation {
asset: enviroment.token.address.clone(),
strategy_allocations:
svec![&setup.env,
Some(StrategyAllocation {
amount: deposit_amount,
strategy_address: enviroment.strategy_contract.address.clone(),
})
]
}
)
]),
).into_val(&setup.env),
sub_invokes: &[]
},
}])
.invest(&investments);

setup.env.ledger().set_timestamp(setup.env.ledger().timestamp() + ONE_YEAR_IN_SECONDS);

// TODO: The vault should call harvest method on the strategy contract
enviroment.strategy_contract.mock_all_auths().harvest(&enviroment.vault_contract.address);

let df_balance_before_withdraw = enviroment.vault_contract.balance(&user);
assert_eq!(df_balance_before_withdraw, deposit_amount - MINIMUM_LIQUIDITY);

enviroment.vault_contract.mock_auths(&[MockAuth {
address: &user.clone(),
invoke: &MockAuthInvoke {
contract: &enviroment.vault_contract.address.clone(),
fn_name: "withdraw",
args: (
df_balance_before_withdraw.clone(),
user.clone()
).into_val(&setup.env),
sub_invokes: &[]
},
}])
.withdraw(&df_balance_before_withdraw, &user);

let user_expected_reward = calculate_yield(deposit_amount.clone(), 1000u32, ONE_YEAR_IN_SECONDS);

let charged_fee_user = (deposit_amount + user_expected_reward - MINIMUM_LIQUIDITY) * (DEFINDEX_FEE as i128 + VAULT_FEE as i128) / 10000;
let expected_amount_user = deposit_amount + user_expected_reward - MINIMUM_LIQUIDITY - charged_fee_user;

let user_balance_after_withdraw = enviroment.token.balance(user);
//TODO: 98 missing?
assert_eq!(user_balance_after_withdraw, expected_amount_user - 98);

let vault_balance = enviroment.token.balance(&enviroment.vault_contract.address);
assert_eq!(vault_balance, 0);
// // TODO: The vault should call harvest method on the strategy contract
// enviroment.strategy_contract.mock_all_auths().harvest(&enviroment.vault_contract.address);

let df_balance = enviroment.vault_contract.balance(&user);
assert_eq!(df_balance, 0);
// let df_balance_before_withdraw = enviroment.vault_contract.balance(&user);
// assert_eq!(df_balance_before_withdraw, deposit_amount - MINIMUM_LIQUIDITY);

// enviroment.vault_contract.mock_auths(&[MockAuth {
// address: &user.clone(),
// invoke: &MockAuthInvoke {
// contract: &enviroment.vault_contract.address.clone(),
// fn_name: "withdraw",
// args: (
// df_balance_before_withdraw.clone(),
// user.clone()
// ).into_val(&setup.env),
// sub_invokes: &[]
// },
// }])
// .withdraw(&df_balance_before_withdraw, &user);

// let user_expected_reward = calculate_yield(deposit_amount.clone(), 1000u32, ONE_YEAR_IN_SECONDS);

// let charged_fee_user = (deposit_amount + user_expected_reward - MINIMUM_LIQUIDITY) * (DEFINDEX_FEE as i128 + VAULT_FEE as i128) / 10000;
// let expected_amount_user = deposit_amount + user_expected_reward - MINIMUM_LIQUIDITY - charged_fee_user;

// let user_balance_after_withdraw = enviroment.token.balance(user);
// //TODO: 98 missing?
// assert_eq!(user_balance_after_withdraw, expected_amount_user - 98);

// let vault_balance = enviroment.token.balance(&enviroment.vault_contract.address);
// assert_eq!(vault_balance, 0);

// let df_balance = enviroment.vault_contract.balance(&user);
// assert_eq!(df_balance, 0);
}
Loading

0 comments on commit fa460a6

Please sign in to comment.