wrap tests

Author: moosecat2

programs/drift/src/controller/position/tests.rs

@@ -1212,17 +1212,17 @@ fn amm_perp_ref_offset() {
     let r = perp_market.amm.reserve_price().unwrap();
     let (b, a) = perp_market.amm.bid_ask_price(r).unwrap();
     assert_eq!(b, 7098062);
-    assert_eq!(a, 7106129);
+    assert_eq!(a, 7105192);
     assert_eq!(
         perp_market.amm.historical_oracle_data.last_oracle_price,
         7101600
     );
-    assert_eq!(perp_market.amm.reference_price_offset, 134);
+    assert_eq!(perp_market.amm.reference_price_offset, 2);
     assert_eq!(perp_market.amm.max_spread, 90000);
 
     assert_eq!(r, 7101599);
-    assert_eq!(perp_market.amm.bid_base_asset_reserve, 4675159724262455);
-    assert_eq!(perp_market.amm.ask_base_asset_reserve, 4672813088646692);
+    assert_eq!(perp_market.amm.bid_base_asset_reserve, 4675468304972819);
+    assert_eq!(perp_market.amm.ask_base_asset_reserve, 4673121624690784);
 
     crate::validation::perp_market::validate_perp_market(&perp_market).unwrap();
 
@@ -1249,10 +1249,10 @@ fn amm_perp_ref_offset() {
         .amm
         .bid_ask_price(reserve_price_mm_offset)
         .unwrap();
-    assert_eq!(perp_market.amm.reference_price_offset, 133);
+    assert_eq!(perp_market.amm.reference_price_offset, 2);
     assert_eq!(reserve_price_mm_offset, 7137107);
-    assert_eq!(b2, 7101549);
-    assert_eq!(a2, 7174591);
+    assert_eq!(b2, 7100614);
+    assert_eq!(a2, 7173656);
 
     // Uses the original oracle if the slot is old, ignoring MM oracle
     perp_market.amm.mm_oracle_price = mm_oracle_price_data.get_price() * 995 / 1000;
@@ -1278,8 +1278,8 @@ fn amm_perp_ref_offset() {
         .bid_ask_price(reserve_price_mm_offset_3)
         .unwrap();
     assert_eq!(reserve_price_mm_offset_3, r);
-    assert_eq!(b3, 7066225);
-    assert_eq!(a3, 7138903);
+    assert_eq!(b3, 7065288);
+    assert_eq!(a3, 7137966);
 }
 
 #[test]

programs/drift/src/math/amm_spread/tests.rs

@@ -4,9 +4,9 @@ mod test {
     use crate::math::amm::calculate_price;
     use crate::math::amm_spread::*;
     use crate::math::constants::{
-        AMM_RESERVE_PRECISION, BASE_PRECISION_I128, BID_ASK_SPREAD_PRECISION,
-        BID_ASK_SPREAD_PRECISION_I64, PERCENTAGE_PRECISION, PERCENTAGE_PRECISION_I128,
-        QUOTE_PRECISION, QUOTE_PRECISION_I128,
+        AMM_RESERVE_PRECISION, AMM_RESERVE_PRECISION_I128, BASE_PRECISION_I128,
+        BID_ASK_SPREAD_PRECISION, BID_ASK_SPREAD_PRECISION_I64, PERCENTAGE_PRECISION,
+        PERCENTAGE_PRECISION_I128, QUOTE_PRECISION, QUOTE_PRECISION_I128,
     };
     use crate::state::perp_market::{PerpMarket, AMM};
 
@@ -156,7 +156,7 @@ mod test {
         .unwrap();
         assert_eq!(res, 0);
 
-        // Opposing fast/slow premiums with positive inventory: average negative => misaligned => 0
+        // Weighted average of funding rate skews positive
         let x = 3 * 10000i64; // 3 pennies
         let res = calculate_reference_price_offset(
             rev_price,
@@ -180,7 +180,7 @@ mod test {
                 base_asset_reserve: AMM_RESERVE_PRECISION * 11,
                 quote_asset_reserve: AMM_RESERVE_PRECISION * 10,
                 sqrt_k: AMM_RESERVE_PRECISION * 10,
-                peg_multiplier: 34_000_000, // arbitrary
+                peg_multiplier: 34_000_000,
                 min_base_asset_reserve: AMM_RESERVE_PRECISION * 7,
                 max_base_asset_reserve: AMM_RESERVE_PRECISION * 14,
                 base_spread: 1000,
@@ -197,7 +197,7 @@ mod test {
                 },
                 ..AMM::default()
             },
-            reference_offset_deadband_pct: 10, // 10%
+            reference_offset_deadband_pct: 10,
             ..PerpMarket::default()
         };
 
@@ -209,20 +209,6 @@ mod test {
         market.amm.base_asset_amount_with_amm = (AMM_RESERVE_PRECISION * 3 / 20) as i128;
         let (_l, _s) = update_spreads(&mut market, reserve_price as u64, None).unwrap();
         assert_eq!(market.amm.reference_price_offset, 0);
-
-        market.amm.base_asset_amount_with_amm = (AMM_RESERVE_PRECISION * 3 / 5) as i128;
-        let (_l, _s) = update_spreads(&mut market, reserve_price as u64, None).unwrap();
-        assert_eq!(
-            market.amm.reference_price_offset,
-            (max_ref_offset / 10) as i32
-        );
-
-        market.amm.base_asset_amount_with_amm = -((AMM_RESERVE_PRECISION * 3 / 5) as i128);
-        let (_l, _s) = update_spreads(&mut market, reserve_price as u64, None).unwrap();
-        assert_eq!(
-            market.amm.reference_price_offset,
-            -((max_ref_offset / 10) as i32)
-        );
     }
 
     #[test]