Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit ed17c7d

Browse files
author
Orex
committed
Rationalize test_setup
1 parent 28b3a0a commit ed17c7d

File tree

11 files changed

+193
-359
lines changed

11 files changed

+193
-359
lines changed

‎programs/perpetuals/tests/native/tests_suite/basic_interactions.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ pub async fn basic_interactions() {
4949
vec!["admin_a", "admin_b", "admin_c"],
5050
"main_pool",
5151
vec![
52-
utils::NamedSetupCustodyWithLiquidityParams {
53-
setup_custody_params: utils::NamedSetupCustodyParams {
52+
utils::SetupCustodyWithLiquidityParams {
53+
setup_custody_params: utils::SetupCustodyParams {
5454
mint_name: "usdc",
5555
is_stable: true,
5656
is_virtual: false,
@@ -67,8 +67,8 @@ pub async fn basic_interactions() {
6767
liquidity_amount: utils::scale(1_000, USDC_DECIMALS),
6868
payer_user_name: "alice",
6969
},
70-
utils::NamedSetupCustodyWithLiquidityParams {
71-
setup_custody_params: utils::NamedSetupCustodyParams {
70+
utils::SetupCustodyWithLiquidityParams {
71+
setup_custody_params: utils::SetupCustodyParams {
7272
mint_name: "eth",
7373
is_stable: false,
7474
is_virtual: false,

‎programs/perpetuals/tests/native/tests_suite/liquidity/fixed_fees.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ pub async fn fixed_fees() {
2323
}],
2424
vec!["admin_a", "admin_b", "admin_c"],
2525
"main_pool",
26-
vec![utils::NamedSetupCustodyWithLiquidityParams {
27-
setup_custody_params: utils::NamedSetupCustodyParams {
26+
vec![utils::SetupCustodyWithLiquidityParams {
27+
setup_custody_params: utils::SetupCustodyParams {
2828
mint_name: "usdc",
2929
is_stable: true,
3030
is_virtual: false,

‎programs/perpetuals/tests/native/tests_suite/liquidity/insuffisient_fund.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ pub async fn insuffisient_fund() {
3030
vec!["admin_a", "admin_b", "admin_c"],
3131
"main_pool",
3232
vec![
33-
utils::NamedSetupCustodyWithLiquidityParams {
34-
setup_custody_params: utils::NamedSetupCustodyParams {
33+
utils::SetupCustodyWithLiquidityParams {
34+
setup_custody_params: utils::SetupCustodyParams {
3535
mint_name: "usdc",
3636
is_stable: true,
3737
is_virtual: false,
@@ -48,8 +48,8 @@ pub async fn insuffisient_fund() {
4848
liquidity_amount: utils::scale(0, USDC_DECIMALS),
4949
payer_user_name: "alice",
5050
},
51-
utils::NamedSetupCustodyWithLiquidityParams {
52-
setup_custody_params: utils::NamedSetupCustodyParams {
51+
utils::SetupCustodyWithLiquidityParams {
52+
setup_custody_params: utils::SetupCustodyParams {
5353
mint_name: "eth",
5454
is_stable: false,
5555
is_virtual: false,

‎programs/perpetuals/tests/native/tests_suite/liquidity/min_max_ratio.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ pub async fn min_max_ratio() {
3030
vec!["admin_a", "admin_b", "admin_c"],
3131
"main_pool",
3232
vec![
33-
utils::NamedSetupCustodyWithLiquidityParams {
34-
setup_custody_params: utils::NamedSetupCustodyParams {
33+
utils::SetupCustodyWithLiquidityParams {
34+
setup_custody_params: utils::SetupCustodyParams {
3535
mint_name: "usdc",
3636
is_stable: true,
3737
is_virtual: false,
@@ -48,8 +48,8 @@ pub async fn min_max_ratio() {
4848
liquidity_amount: utils::scale(1_500, USDC_DECIMALS),
4949
payer_user_name: "alice",
5050
},
51-
utils::NamedSetupCustodyWithLiquidityParams {
52-
setup_custody_params: utils::NamedSetupCustodyParams {
51+
utils::SetupCustodyWithLiquidityParams {
52+
setup_custody_params: utils::SetupCustodyParams {
5353
mint_name: "eth",
5454
is_stable: false,
5555
is_virtual: false,

‎programs/perpetuals/tests/native/tests_suite/lp_token/lp_token_price.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ pub async fn lp_token_price() {
2929
vec!["admin_a", "admin_b", "admin_c"],
3030
"main_pool",
3131
vec![
32-
utils::NamedSetupCustodyWithLiquidityParams {
33-
setup_custody_params: utils::NamedSetupCustodyParams {
32+
utils::SetupCustodyWithLiquidityParams {
33+
setup_custody_params: utils::SetupCustodyParams {
3434
mint_name: "usdc",
3535
is_stable: true,
3636
is_virtual: false,
@@ -47,8 +47,8 @@ pub async fn lp_token_price() {
4747
liquidity_amount: utils::scale(15_000, USDC_DECIMALS),
4848
payer_user_name: "alice",
4949
},
50-
utils::NamedSetupCustodyWithLiquidityParams {
51-
setup_custody_params: utils::NamedSetupCustodyParams {
50+
utils::SetupCustodyWithLiquidityParams {
51+
setup_custody_params: utils::SetupCustodyParams {
5252
mint_name: "eth",
5353
is_stable: false,
5454
is_virtual: false,

‎programs/perpetuals/tests/native/tests_suite/position/liquidate_position.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ pub async fn liquidate_position() {
4646
vec!["admin_a", "admin_b", "admin_c"],
4747
"main_pool",
4848
vec![
49-
utils::NamedSetupCustodyWithLiquidityParams {
50-
setup_custody_params: utils::NamedSetupCustodyParams {
49+
utils::SetupCustodyWithLiquidityParams {
50+
setup_custody_params: utils::SetupCustodyParams {
5151
mint_name: "usdc",
5252
is_stable: true,
5353
is_virtual: false,
@@ -64,8 +64,8 @@ pub async fn liquidate_position() {
6464
liquidity_amount: utils::scale(1_000, USDC_DECIMALS),
6565
payer_user_name: "alice",
6666
},
67-
utils::NamedSetupCustodyWithLiquidityParams {
68-
setup_custody_params: utils::NamedSetupCustodyParams {
67+
utils::SetupCustodyWithLiquidityParams {
68+
setup_custody_params: utils::SetupCustodyParams {
6969
mint_name: "eth",
7070
is_stable: false,
7171
is_virtual: false,

‎programs/perpetuals/tests/native/tests_suite/position/max_user_profit.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ pub async fn max_user_profit() {
4242
vec!["admin_a", "admin_b", "admin_c"],
4343
"main_pool",
4444
vec![
45-
utils::NamedSetupCustodyWithLiquidityParams {
46-
setup_custody_params: utils::NamedSetupCustodyParams {
45+
utils::SetupCustodyWithLiquidityParams {
46+
setup_custody_params: utils::SetupCustodyParams {
4747
mint_name: "usdc",
4848
is_stable: true,
4949
is_virtual: false,
@@ -60,8 +60,8 @@ pub async fn max_user_profit() {
6060
liquidity_amount: utils::scale(1_000, USDC_DECIMALS),
6161
payer_user_name: "alice",
6262
},
63-
utils::NamedSetupCustodyWithLiquidityParams {
64-
setup_custody_params: utils::NamedSetupCustodyParams {
63+
utils::SetupCustodyWithLiquidityParams {
64+
setup_custody_params: utils::SetupCustodyParams {
6565
mint_name: "eth",
6666
is_stable: false,
6767
is_virtual: false,

‎programs/perpetuals/tests/native/tests_suite/position/min_max_leverage.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ pub async fn min_max_leverage() {
4141
vec!["admin_a", "admin_b", "admin_c"],
4242
"main_pool",
4343
vec![
44-
utils::NamedSetupCustodyWithLiquidityParams {
45-
setup_custody_params: utils::NamedSetupCustodyParams {
44+
utils::SetupCustodyWithLiquidityParams {
45+
setup_custody_params: utils::SetupCustodyParams {
4646
mint_name: "usdc",
4747
is_stable: true,
4848
is_virtual: false,
@@ -59,8 +59,8 @@ pub async fn min_max_leverage() {
5959
liquidity_amount: utils::scale(1_000, USDC_DECIMALS),
6060
payer_user_name: "alice",
6161
},
62-
utils::NamedSetupCustodyWithLiquidityParams {
63-
setup_custody_params: utils::NamedSetupCustodyParams {
62+
utils::SetupCustodyWithLiquidityParams {
63+
setup_custody_params: utils::SetupCustodyParams {
6464
mint_name: "eth",
6565
is_stable: false,
6666
is_virtual: false,

‎programs/perpetuals/tests/native/tests_suite/swap/insuffisient_fund.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ pub async fn insuffisient_fund() {
3838
vec!["admin_a", "admin_b", "admin_c"],
3939
"main_pool",
4040
vec![
41-
utils::NamedSetupCustodyWithLiquidityParams {
42-
setup_custody_params: utils::NamedSetupCustodyParams {
41+
utils::SetupCustodyWithLiquidityParams {
42+
setup_custody_params: utils::SetupCustodyParams {
4343
mint_name: "usdc",
4444
is_stable: true,
4545
is_virtual: false,
@@ -56,8 +56,8 @@ pub async fn insuffisient_fund() {
5656
liquidity_amount: utils::scale(7_500, USDC_DECIMALS),
5757
payer_user_name: "alice",
5858
},
59-
utils::NamedSetupCustodyWithLiquidityParams {
60-
setup_custody_params: utils::NamedSetupCustodyParams {
59+
utils::SetupCustodyWithLiquidityParams {
60+
setup_custody_params: utils::SetupCustodyParams {
6161
mint_name: "eth",
6262
is_stable: false,
6363
is_virtual: false,

0 commit comments

Comments
 (0)