Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@nope-finance
nope-finance committed Jun 29, 2021
1 parent c82b9a2 commit f5b5873
Show file tree
Hide file tree
Showing 9 changed files with 66 additions and 28 deletions.
2 changes: 1 addition & 1 deletion token-lending/program/tests/borrow_obligation_liquidity.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ async fn test_borrow_sol_max_amount() {
);

// limit to track compute unit increase
test.set_bpf_compute_max_units(42_000);
test.set_bpf_compute_max_units(45_000);

const FEE_AMOUNT: u64 = 5000;
const HOST_FEE_AMOUNT: u64 = 1000;
Expand Down
Binary file added token-lending/program/tests/fixtures/AdtRGGhmqvom3Jemp5YNrxd9q9unX36BZk1pujkkXijL.bin
View file
Binary file not shown.
Binary file added token-lending/program/tests/fixtures/BAoygKcKN7wk8yKzLD6sxzUQUqLvhBV1rjMA4UJqfZuH.bin
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions token-lending/program/tests/fixtures/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@ solana config set --url https://api.devnet.solana.com
solana account 3Mnn2fX6rQyUsyELYms1sBJyChWofzSNRoqYzvgMVz5E --output-file 3Mnn2fX6rQyUsyELYms1sBJyChWofzSNRoqYzvgMVz5E.bin
# Pyth price: SOL/USD
solana account J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix --output-file J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix.bin
# Switchboard price: SOL/USD
solana account AdtRGGhmqvom3Jemp5YNrxd9q9unX36BZk1pujkkXijL --output-file AdtRGGhmqvom3Jemp5YNrxd9q9unX36BZk1pujkkXijL.bin
# Pyth product: SRM/USD
solana account 6MEwdxe4g1NeAF9u6KDG14anJpFsVEa2cvr5H6iriFZ8 --output-file 6MEwdxe4g1NeAF9u6KDG14anJpFsVEa2cvr5H6iriFZ8.bin
# Pyth price: SRM/USD
solana account 992moaMQKs32GKZ9dxi8keyM2bUmbrwBZpK4p2K6X5Vs --output-file 992moaMQKs32GKZ9dxi8keyM2bUmbrwBZpK4p2K6X5Vs.bin
# Switchboard price: SRM/USD
solana account BAoygKcKN7wk8yKzLD6sxzUQUqLvhBV1rjMA4UJqfZuH --output-file BAoygKcKN7wk8yKzLD6sxzUQUqLvhBV1rjMA4UJqfZuH.bin
```
62 changes: 44 additions & 18 deletions token-lending/program/tests/helpers/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,11 @@ pub const TEST_RESERVE_CONFIG: ReserveConfig = ReserveConfig {

pub const SOL_PYTH_PRODUCT: &str = "3Mnn2fX6rQyUsyELYms1sBJyChWofzSNRoqYzvgMVz5E";
pub const SOL_PYTH_PRICE: &str = "J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix";
pub const SOL_SWITCHBOARD_FEED: &str = "AdtRGGhmqvom3Jemp5YNrxd9q9unX36BZk1pujkkXijL";

pub const SRM_PYTH_PRODUCT: &str = "6MEwdxe4g1NeAF9u6KDG14anJpFsVEa2cvr5H6iriFZ8";
pub const SRM_PYTH_PRICE: &str = "992moaMQKs32GKZ9dxi8keyM2bUmbrwBZpK4p2K6X5Vs";
pub const SRM_SWITCHBOARD_FEED: &str = "BAoygKcKN7wk8yKzLD6sxzUQUqLvhBV1rjMA4UJqfZuH";

pub const USDC_MINT: &str = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";

Expand Down Expand Up @@ -342,8 +344,8 @@ pub fn add_reserve(
mint_decimals: liquidity_mint_decimals,
supply_pubkey: liquidity_supply_pubkey,
fee_receiver: liquidity_fee_receiver_pubkey,
pyth_oracle_pubkey: oracle.price_pubkey,
switchboard_oracle_pubkey: oracle.price_pubkey,
pyth_oracle_pubkey: oracle.pyth_price_pubkey,
switchboard_oracle_pubkey: oracle.switchboard_feed_pubkey,
market_price: oracle.price,
}),
collateral: ReserveCollateral::new(NewReserveCollateralParams {
Expand Down Expand Up @@ -415,8 +417,8 @@ pub fn add_reserve(
liquidity_supply_pubkey,
liquidity_fee_receiver_pubkey,
liquidity_host_pubkey,
liquidity_pyth_oracle_pubkey: oracle.price_pubkey,
liquidity_switchboard_oracle_pubkey: oracle.price_pubkey,
liquidity_pyth_oracle_pubkey: oracle.pyth_price_pubkey,
liquidity_switchboard_oracle_pubkey: oracle.switchboard_feed_pubkey,
collateral_mint_pubkey,
collateral_supply_pubkey,
user_liquidity_pubkey,
Expand Down Expand Up @@ -813,8 +815,9 @@ impl TestReserve {
liquidity_fee_receiver_keypair.pubkey(),
collateral_mint_keypair.pubkey(),
collateral_supply_keypair.pubkey(),
oracle.product_pubkey,
oracle.price_pubkey,
oracle.pyth_product_pubkey,
oracle.pyth_price_pubkey,
oracle.switchboard_feed_pubkey,
lending_market.pubkey,
lending_market.owner.pubkey(),
user_transfer_authority_keypair.pubkey(),
Expand Down Expand Up @@ -854,8 +857,8 @@ impl TestReserve {
liquidity_supply_pubkey: liquidity_supply_keypair.pubkey(),
liquidity_fee_receiver_pubkey: liquidity_fee_receiver_keypair.pubkey(),
liquidity_host_pubkey: liquidity_host_keypair.pubkey(),
liquidity_pyth_oracle_pubkey: oracle.price_pubkey,
liquidity_switchboard_oracle_pubkey: oracle.price_pubkey,
liquidity_pyth_oracle_pubkey: oracle.pyth_price_pubkey,
liquidity_switchboard_oracle_pubkey: oracle.switchboard_feed_pubkey,
collateral_mint_pubkey: collateral_mint_keypair.pubkey(),
collateral_supply_pubkey: collateral_supply_keypair.pubkey(),
user_liquidity_pubkey,
Expand Down Expand Up @@ -1071,8 +1074,9 @@ pub fn add_usdc_mint(test: &mut ProgramTest) -> TestMint {
}

pub struct TestOracle {
pub product_pubkey: Pubkey,
pub price_pubkey: Pubkey,
pub pyth_product_pubkey: Pubkey,
pub pyth_price_pubkey: Pubkey,
pub switchboard_feed_pubkey: Pubkey,
pub price: Decimal,
}

Expand All @@ -1081,6 +1085,7 @@ pub fn add_sol_oracle(test: &mut ProgramTest) -> TestOracle {
test,
Pubkey::from_str(SOL_PYTH_PRODUCT).unwrap(),
Pubkey::from_str(SOL_PYTH_PRICE).unwrap(),
Pubkey::from_str(SOL_SWITCHBOARD_FEED).unwrap(),
// Set SOL price to $20
Decimal::from(20u64),
)
Expand All @@ -1092,29 +1097,31 @@ pub fn add_usdc_oracle(test: &mut ProgramTest) -> TestOracle {
// Mock with SRM since Pyth doesn't have USDC yet
Pubkey::from_str(SRM_PYTH_PRODUCT).unwrap(),
Pubkey::from_str(SRM_PYTH_PRICE).unwrap(),
Pubkey::from_str(SRM_SWITCHBOARD_FEED).unwrap(),
// Set USDC price to $1
Decimal::from(1u64),
)
}

pub fn add_oracle(
test: &mut ProgramTest,
product_pubkey: Pubkey,
price_pubkey: Pubkey,
pyth_product_pubkey: Pubkey,
pyth_price_pubkey: Pubkey,
switchboard_feed_pubkey: Pubkey,
price: Decimal,
) -> TestOracle {
let oracle_program_id = read_keypair_file("tests/fixtures/oracle_program_id.json").unwrap();

// Add Pyth product account
test.add_account_with_file_data(
product_pubkey,
pyth_product_pubkey,
u32::MAX as u64,
oracle_program_id.pubkey(),
&format!("{}.bin", product_pubkey.to_string()),
&format!("{}.bin", pyth_product_pubkey.to_string()),
);

// Add Pyth price account after setting the price
let filename = &format!("{}.bin", price_pubkey.to_string());
let filename = &format!("{}.bin", pyth_price_pubkey.to_string());
let mut pyth_price_data = read_file(find_file(filename).unwrap_or_else(|| {
panic!("Unable to locate {}", filename);
}));
Expand All @@ -1135,7 +1142,7 @@ pub fn add_oracle(
.unwrap();

test.add_account(
price_pubkey,
pyth_price_pubkey,
Account {
lamports: u32::MAX as u64,
data: pyth_price_data,
Expand All @@ -1145,9 +1152,28 @@ pub fn add_oracle(
},
);

// Add Switchboard price feed account after setting the price
let filename2 = &format!("{}.bin", switchboard_feed_pubkey.to_string());
// mut and set data here later
let switchboard_feed_data = read_file(find_file(filename2).unwrap_or_else(|| {
panic!("Unable to locate {}", filename2);
}));

test.add_account(
switchboard_feed_pubkey,
Account {
lamports: u32::MAX as u64,
data: switchboard_feed_data,
owner: oracle_program_id.pubkey(),
executable: false,
rent_epoch: 0,
},
);

TestOracle {
product_pubkey,
price_pubkey,
pyth_product_pubkey,
pyth_price_pubkey,
switchboard_feed_pubkey,
price,
}
}
Expand Down
5 changes: 3 additions & 2 deletions token-lending/program/tests/init_reserve.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,9 @@ async fn test_already_initialized() {
usdc_test_reserve.liquidity_fee_receiver_pubkey,
usdc_test_reserve.collateral_mint_pubkey,
usdc_test_reserve.collateral_supply_pubkey,
usdc_oracle.product_pubkey,
usdc_oracle.price_pubkey,
usdc_oracle.pyth_product_pubkey,
usdc_oracle.pyth_price_pubkey,
usdc_oracle.switchboard_feed_pubkey,
lending_market.pubkey,
lending_market.owner.pubkey(),
user_transfer_authority.pubkey(),
Expand Down
9 changes: 6 additions & 3 deletions token-lending/program/tests/obligation_end_to_end.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ async fn test_success() {
refresh_reserve(
spl_token_lending::id(),
sol_test_reserve.pubkey,
sol_oracle.price_pubkey,
sol_oracle.pyth_price_pubkey,
sol_oracle.switchboard_feed_pubkey,
),
// 3
approve(
Expand Down Expand Up @@ -160,7 +161,8 @@ async fn test_success() {
refresh_reserve(
spl_token_lending::id(),
usdc_test_reserve.pubkey,
usdc_oracle.price_pubkey,
usdc_oracle.pyth_price_pubkey,
usdc_oracle.switchboard_feed_pubkey,
),
// 7
borrow_obligation_liquidity(
Expand All @@ -179,7 +181,8 @@ async fn test_success() {
refresh_reserve(
spl_token_lending::id(),
usdc_test_reserve.pubkey,
usdc_oracle.price_pubkey,
usdc_oracle.pyth_price_pubkey,
usdc_oracle.switchboard_feed_pubkey,
),
// 9
refresh_obligation(
Expand Down
6 changes: 4 additions & 2 deletions token-lending/program/tests/refresh_obligation.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,14 @@ async fn test_success() {
refresh_reserve(
spl_token_lending::id(),
usdc_test_reserve.pubkey,
usdc_oracle.price_pubkey,
usdc_oracle.pyth_price_pubkey,
usdc_oracle.switchboard_feed_pubkey,
),
refresh_reserve(
spl_token_lending::id(),
sol_test_reserve.pubkey,
sol_oracle.price_pubkey,
sol_oracle.pyth_price_pubkey,
sol_oracle.switchboard_feed_pubkey,
),
refresh_obligation(
spl_token_lending::id(),
Expand Down
6 changes: 4 additions & 2 deletions token-lending/program/tests/refresh_reserve.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,14 @@ async fn test_success() {
refresh_reserve(
spl_token_lending::id(),
usdc_test_reserve.pubkey,
usdc_oracle.price_pubkey,
usdc_oracle.pyth_price_pubkey,
usdc_oracle.switchboard_feed_pubkey,
),
refresh_reserve(
spl_token_lending::id(),
sol_test_reserve.pubkey,
sol_oracle.price_pubkey,
sol_oracle.pyth_price_pubkey,
sol_oracle.switchboard_feed_pubkey,
),
],
Some(&payer.pubkey()),
Expand Down

0 comments on commit f5b5873

Please sign in to comment.