@@ -53,17 +53,7 @@ fn amm_pool_balance_liq_fees_example() {
5353 let perp_market_loader: AccountLoader < PerpMarket > =
5454 AccountLoader :: try_from ( & perp_market_account_info) . unwrap ( ) ;
5555
56- let perp_market_map = PerpMarketMap :: load_one ( & perp_market_account_info, true ) . unwrap ( ) ;
57-
5856 let now = 1725948560 ;
59- let clock_slot = 326319440 ;
60- let clock = Clock {
61- unix_timestamp : now,
62- slot : clock_slot,
63- ..Clock :: default ( )
64- } ;
65-
66- let mut state = State :: default ( ) ;
6757
6858 let mut prelaunch_oracle_price = PrelaunchOracle {
6959 price : PRICE_PRECISION_I64 ,
@@ -77,9 +67,8 @@ fn amm_pool_balance_liq_fees_example() {
7767 prelaunch_oracle_price,
7868 & prelaunch_oracle_price_key,
7969 PrelaunchOracle ,
80- oracle_account_info
70+ _oracle_account_info
8171 ) ;
82- let mut oracle_map = OracleMap :: load_one ( & oracle_account_info, clock_slot, None ) . unwrap ( ) ;
8372
8473 let mut spot_market = SpotMarket {
8574 cumulative_deposit_interest : 11425141382 ,
@@ -609,11 +598,11 @@ fn amm_ref_price_decay_tail_test() {
609598
610599 let signed_liquidity_ratio = liquidity_ratio
611600 . checked_mul (
612- ( perp_market
601+ perp_market
613602 . amm
614603 . get_protocol_owned_position ( )
615604 . unwrap ( )
616- . signum ( ) as i128 ) ,
605+ . signum ( ) as i128 ,
617606 )
618607 . unwrap ( ) ;
619608
@@ -654,7 +643,7 @@ fn amm_ref_price_decay_tail_test() {
654643 & state. oracle_guard_rails . validity ,
655644 )
656645 . unwrap ( ) ;
657- let cost = _update_amm (
646+ _update_amm (
658647 & mut perp_market,
659648 & mm_oracle_price_data,
660649 & state,
@@ -687,7 +676,7 @@ fn amm_ref_price_decay_tail_test() {
687676 )
688677 . unwrap ( ) ;
689678
690- let cost = _update_amm (
679+ _update_amm (
691680 & mut perp_market,
692681 & mm_oracle_price_data,
693682 & state,
@@ -786,11 +775,11 @@ fn amm_ref_price_offset_decay_logic() {
786775
787776 let signed_liquidity_ratio = liquidity_ratio
788777 . checked_mul (
789- ( perp_market
778+ perp_market
790779 . amm
791780 . get_protocol_owned_position ( )
792781 . unwrap ( )
793- . signum ( ) as i128 ) ,
782+ . signum ( ) as i128 ,
794783 )
795784 . unwrap ( ) ;
796785
@@ -831,7 +820,7 @@ fn amm_ref_price_offset_decay_logic() {
831820 & state. oracle_guard_rails . validity ,
832821 )
833822 . unwrap ( ) ;
834- let cost = _update_amm (
823+ _update_amm (
835824 & mut perp_market,
836825 & mm_oracle_price_data,
837826 & state,
@@ -871,7 +860,7 @@ fn amm_ref_price_offset_decay_logic() {
871860 )
872861 . unwrap ( ) ;
873862
874- let cost = _update_amm (
863+ _update_amm (
875864 & mut perp_market,
876865 & mm_oracle_price_data,
877866 & state,
@@ -961,11 +950,11 @@ fn amm_negative_ref_price_offset_decay_logic() {
961950
962951 let signed_liquidity_ratio = liquidity_ratio
963952 . checked_mul (
964- ( perp_market
953+ perp_market
965954 . amm
966955 . get_protocol_owned_position ( )
967956 . unwrap ( )
968- . signum ( ) as i128 ) ,
957+ . signum ( ) as i128 ,
969958 )
970959 . unwrap ( ) ;
971960
@@ -1006,7 +995,7 @@ fn amm_negative_ref_price_offset_decay_logic() {
1006995 & state. oracle_guard_rails . validity ,
1007996 )
1008997 . unwrap ( ) ;
1009- let cost = _update_amm (
998+ _update_amm (
1010999 & mut perp_market,
10111000 & mm_oracle_price_data,
10121001 & state,
@@ -1047,7 +1036,7 @@ fn amm_negative_ref_price_offset_decay_logic() {
10471036 )
10481037 . unwrap ( ) ;
10491038
1050- let cost = _update_amm (
1039+ _update_amm (
10511040 & mut perp_market,
10521041 & mm_oracle_price_data,
10531042 & state,
@@ -1147,11 +1136,11 @@ fn amm_perp_ref_offset() {
11471136
11481137 let signed_liquidity_ratio = liquidity_ratio
11491138 . checked_mul (
1150- ( perp_market
1139+ perp_market
11511140 . amm
11521141 . get_protocol_owned_position ( )
11531142 . unwrap ( )
1154- . signum ( ) as i128 ) ,
1143+ . signum ( ) as i128 ,
11551144 )
11561145 . unwrap ( ) ;
11571146
@@ -1173,7 +1162,7 @@ fn amm_perp_ref_offset() {
11731162 max_ref_offset,
11741163 )
11751164 . unwrap ( ) ;
1176- assert_eq ! ( res, ( perp_market . amm . max_spread / 2 ) as i32 ) ;
1165+ assert_eq ! ( res, 45000 ) ;
11771166 assert_eq ! ( perp_market. amm. reference_price_offset, 18000 ) ; // not updated vs market account
11781167
11791168 let now = 1741207620 + 1 ;
@@ -1193,7 +1182,7 @@ fn amm_perp_ref_offset() {
11931182 & state. oracle_guard_rails . validity ,
11941183 )
11951184 . unwrap ( ) ;
1196- let cost = _update_amm (
1185+ _update_amm (
11971186 & mut perp_market,
11981187 & mm_oracle_price_data,
11991188 & state,
@@ -1252,21 +1241,15 @@ fn amm_perp_ref_offset() {
12521241 // Uses the original oracle if the slot is old, ignoring MM oracle
12531242 perp_market. amm . mm_oracle_price = mm_oracle_price_data. get_price ( ) * 995 / 1000 ;
12541243 perp_market. amm . mm_oracle_slot = clock_slot - 100 ;
1255- let mut mm_oracle_price = perp_market
1244+ let mm_oracle_price = perp_market
12561245 . get_mm_oracle_price_data (
12571246 oracle_price_data,
12581247 clock_slot,
12591248 & state. oracle_guard_rails . validity ,
12601249 )
12611250 . unwrap ( ) ;
12621251
1263- let _ = _update_amm (
1264- & mut perp_market,
1265- & mut mm_oracle_price,
1266- & state,
1267- now,
1268- clock_slot,
1269- ) ;
1252+ let _ = _update_amm ( & mut perp_market, & mm_oracle_price, & state, now, clock_slot) ;
12701253 let reserve_price_mm_offset_3 = perp_market. amm . reserve_price ( ) . unwrap ( ) ;
12711254 let ( b3, a3) = perp_market
12721255 . amm
0 commit comments