fix tests (#1764)

Author: moosecat2

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

@@ -40,7 +40,6 @@ use crate::test_utils::get_hardcoded_pyth_price;
 use crate::QUOTE_PRECISION_I64;
 use anchor_lang::prelude::{AccountLoader, Clock};
 use anchor_lang::Owner;
-use solana_program::clock;
 use solana_program::pubkey::Pubkey;
 use std::str::FromStr;
 
@@ -675,9 +674,12 @@ fn amm_ref_price_decay_tail_test() {
         delay: 1,
         has_sufficient_number_of_data_points: true,
     };
+    let mut mm_oracle_price_data = perp_market
+        .get_mm_oracle_price_data(oracle_price_data, clock_slot)
+        .unwrap();
     let cost = _update_amm(
         &mut perp_market,
-        &oracle_price_data,
+        &mut mm_oracle_price_data,
         &state,
         now,
         clock_slot,
@@ -700,10 +702,13 @@ fn amm_ref_price_decay_tail_test() {
             now += 250;
             clock_slot += 700;
         }
+        let mut mm_oracle_price_data = perp_market
+            .get_mm_oracle_price_data(oracle_price_data, clock_slot)
+            .unwrap();
 
         let cost = _update_amm(
             &mut perp_market,
-            &oracle_price_data,
+            &mut mm_oracle_price_data,
             &state,
             now,
             clock_slot,
@@ -837,9 +842,12 @@ fn amm_ref_price_offset_decay_logic() {
         delay: 1,
         has_sufficient_number_of_data_points: true,
     };
+    let mut mm_oracle_price_data = perp_market
+        .get_mm_oracle_price_data(oracle_price_data, clock_slot)
+        .unwrap();
     let cost = _update_amm(
         &mut perp_market,
-        &oracle_price_data,
+        &mut mm_oracle_price_data,
         &state,
         now,
         clock_slot,
@@ -869,10 +877,13 @@ fn amm_ref_price_offset_decay_logic() {
             now += 1;
             clock_slot += 2;
         }
+        let mut mm_oracle_price_data = perp_market
+            .get_mm_oracle_price_data(oracle_price_data, clock_slot)
+            .unwrap();
 
         let cost = _update_amm(
             &mut perp_market,
-            &oracle_price_data,
+            &mut mm_oracle_price_data,
             &state,
             now,
             clock_slot,
@@ -996,9 +1007,12 @@ fn amm_negative_ref_price_offset_decay_logic() {
         delay: 1,
         has_sufficient_number_of_data_points: true,
     };
+    let mut mm_oracle_price_data = perp_market
+        .get_mm_oracle_price_data(oracle_price_data, clock_slot)
+        .unwrap();
     let cost = _update_amm(
         &mut perp_market,
-        &oracle_price_data,
+        &mut mm_oracle_price_data,
         &state,
         now,
         clock_slot,
@@ -1029,10 +1043,13 @@ fn amm_negative_ref_price_offset_decay_logic() {
             now += 1;
             clock_slot += 2;
         }
+        let mut mm_oracle_price_data = perp_market
+            .get_mm_oracle_price_data(oracle_price_data, clock_slot)
+            .unwrap();
 
         let cost = _update_amm(
             &mut perp_market,
-            &oracle_price_data,
+            &mut mm_oracle_price_data,
             &state,
             now,
             clock_slot,

sdk/src/idl/drift.json

@@ -1461,6 +1461,11 @@
           "name": "user",
           "isMut": true,
           "isSigner": false
+        },
+        {
+          "name": "signer",
+          "isMut": false,
+          "isSigner": true
         }
       ],
       "args": [

sdk/src/math/amm.ts

@@ -1044,9 +1044,10 @@ export function calculateSpreadReserves(
 		amm.curveUpdateIntensity > 100;
 
 	if (doReferencePricOffsetSmooth) {
-		if (oraclePriceData.slot !== amm.lastUpdateSlot) {
+		if (mmOraclePriceData.oraclePriceData.slot !== amm.lastUpdateSlot) {
 			const slotsPassed =
-				oraclePriceData.slot.toNumber() - amm.lastUpdateSlot.toNumber();
+				mmOraclePriceData.oraclePriceData.slot.toNumber() -
+				amm.lastUpdateSlot.toNumber();
 			const fullOffsetDelta = referencePriceOffset - amm.referencePriceOffset;
 			const raw = Math.trunc(
 				Math.min(Math.abs(fullOffsetDelta), slotsPassed * 1000) / 10

tests/liquidityProvider.ts

@@ -1609,6 +1609,8 @@ describe('liquidity providing', () => {
 		assert(posAfterSettle.quoteAssetAmount.eq(posAfter.quoteAssetAmount));
 	});
 
+	return;
+
 	it('permissionless lp burn', async () => {
 		return;
 		const lpAmount = new BN(1 * BASE_PRECISION.toNumber());
@@ -1634,8 +1636,6 @@ describe('liquidity providing', () => {
 		// assert(position.lpShares.eq(ZERO));
 	});
 
-	return;
-
 	it('lp gets paid in funding (todo)', async () => {
 		const market = driftClient.getPerpMarketAccount(1);
 		const marketIndex = market.marketIndex;