@@ -6,8 +6,7 @@ use crate::controller::repeg::_update_amm;
66
77use crate :: math:: amm:: calculate_market_open_bids_asks;
88use crate :: math:: constants:: {
9- AMM_RESERVE_PRECISION , AMM_RESERVE_PRECISION_I128 , BASE_PRECISION , BASE_PRECISION_I64 ,
10- PRICE_PRECISION_I64 , PRICE_PRECISION_U64 , QUOTE_PRECISION_I128 ,
9+ BASE_PRECISION , BASE_PRECISION_I64 , PRICE_PRECISION_I64 , PRICE_PRECISION_U64 ,
1110 SPOT_CUMULATIVE_INTEREST_PRECISION , SPOT_WEIGHT_PRECISION ,
1211} ;
1312use crate :: math:: oracle:: OracleValidity ;
@@ -34,7 +33,6 @@ use crate::state::spot_market_map::SpotMarketMap;
3433use crate :: state:: user:: SpotPosition ;
3534use crate :: test_utils:: get_anchor_account_bytes;
3635use crate :: test_utils:: get_hardcoded_pyth_price;
37- use crate :: QUOTE_PRECISION_I64 ;
3836use anchor_lang:: prelude:: { AccountLoader , Clock } ;
3937use anchor_lang:: Owner ;
4038use solana_program:: pubkey:: Pubkey ;
@@ -55,17 +53,7 @@ fn amm_pool_balance_liq_fees_example() {
5553 let perp_market_loader: AccountLoader < PerpMarket > =
5654 AccountLoader :: try_from ( & perp_market_account_info) . unwrap ( ) ;
5755
58- let perp_market_map = PerpMarketMap :: load_one ( & perp_market_account_info, true ) . unwrap ( ) ;
59-
6056 let now = 1725948560 ;
61- let clock_slot = 326319440 ;
62- let clock = Clock {
63- unix_timestamp : now,
64- slot : clock_slot,
65- ..Clock :: default ( )
66- } ;
67-
68- let mut state = State :: default ( ) ;
6957
7058 let mut prelaunch_oracle_price = PrelaunchOracle {
7159 price : PRICE_PRECISION_I64 ,
@@ -79,9 +67,8 @@ fn amm_pool_balance_liq_fees_example() {
7967 prelaunch_oracle_price,
8068 & prelaunch_oracle_price_key,
8169 PrelaunchOracle ,
82- oracle_account_info
70+ _oracle_account_info
8371 ) ;
84- let mut oracle_map = OracleMap :: load_one ( & oracle_account_info, clock_slot, None ) . unwrap ( ) ;
8572
8673 let mut spot_market = SpotMarket {
8774 cumulative_deposit_interest : 11425141382 ,
@@ -611,11 +598,11 @@ fn amm_ref_price_decay_tail_test() {
611598
612599 let signed_liquidity_ratio = liquidity_ratio
613600 . checked_mul (
614- ( perp_market
601+ perp_market
615602 . amm
616603 . get_protocol_owned_position ( )
617604 . unwrap ( )
618- . signum ( ) as i128 ) ,
605+ . signum ( ) as i128 ,
619606 )
620607 . unwrap ( ) ;
621608
@@ -656,7 +643,7 @@ fn amm_ref_price_decay_tail_test() {
656643 & state. oracle_guard_rails . validity ,
657644 )
658645 . unwrap ( ) ;
659- let cost = _update_amm (
646+ _update_amm (
660647 & mut perp_market,
661648 & mm_oracle_price_data,
662649 & state,
@@ -689,7 +676,7 @@ fn amm_ref_price_decay_tail_test() {
689676 )
690677 . unwrap ( ) ;
691678
692- let cost = _update_amm (
679+ _update_amm (
693680 & mut perp_market,
694681 & mm_oracle_price_data,
695682 & state,
@@ -788,11 +775,11 @@ fn amm_ref_price_offset_decay_logic() {
788775
789776 let signed_liquidity_ratio = liquidity_ratio
790777 . checked_mul (
791- ( perp_market
778+ perp_market
792779 . amm
793780 . get_protocol_owned_position ( )
794781 . unwrap ( )
795- . signum ( ) as i128 ) ,
782+ . signum ( ) as i128 ,
796783 )
797784 . unwrap ( ) ;
798785
@@ -833,7 +820,7 @@ fn amm_ref_price_offset_decay_logic() {
833820 & state. oracle_guard_rails . validity ,
834821 )
835822 . unwrap ( ) ;
836- let cost = _update_amm (
823+ _update_amm (
837824 & mut perp_market,
838825 & mm_oracle_price_data,
839826 & state,
@@ -873,7 +860,7 @@ fn amm_ref_price_offset_decay_logic() {
873860 )
874861 . unwrap ( ) ;
875862
876- let cost = _update_amm (
863+ _update_amm (
877864 & mut perp_market,
878865 & mm_oracle_price_data,
879866 & state,
@@ -962,11 +949,11 @@ fn amm_negative_ref_price_offset_decay_logic() {
962949
963950 let signed_liquidity_ratio = liquidity_ratio
964951 . checked_mul (
965- ( perp_market
952+ perp_market
966953 . amm
967954 . get_protocol_owned_position ( )
968955 . unwrap ( )
969- . signum ( ) as i128 ) ,
956+ . signum ( ) as i128 ,
970957 )
971958 . unwrap ( ) ;
972959
@@ -1007,7 +994,7 @@ fn amm_negative_ref_price_offset_decay_logic() {
1007994 & state. oracle_guard_rails . validity ,
1008995 )
1009996 . unwrap ( ) ;
1010- let cost = _update_amm (
997+ _update_amm (
1011998 & mut perp_market,
1012999 & mm_oracle_price_data,
10131000 & state,
@@ -1048,7 +1035,7 @@ fn amm_negative_ref_price_offset_decay_logic() {
10481035 )
10491036 . unwrap ( ) ;
10501037
1051- let cost = _update_amm (
1038+ _update_amm (
10521039 & mut perp_market,
10531040 & mm_oracle_price_data,
10541041 & state,
@@ -1148,11 +1135,11 @@ fn amm_perp_ref_offset() {
11481135
11491136 let signed_liquidity_ratio = liquidity_ratio
11501137 . checked_mul (
1151- ( perp_market
1138+ perp_market
11521139 . amm
11531140 . get_protocol_owned_position ( )
11541141 . unwrap ( )
1155- . signum ( ) as i128 ) ,
1142+ . signum ( ) as i128 ,
11561143 )
11571144 . unwrap ( ) ;
11581145
@@ -1194,7 +1181,7 @@ fn amm_perp_ref_offset() {
11941181 & state. oracle_guard_rails . validity ,
11951182 )
11961183 . unwrap ( ) ;
1197- let cost = _update_amm (
1184+ _update_amm (
11981185 & mut perp_market,
11991186 & mm_oracle_price_data,
12001187 & state,
0 commit comments