update tests and amm cache iteration method

Author: moosecat2

programs/drift/src/instructions/lp_pool.rs

@@ -101,6 +101,9 @@ pub fn handle_update_constituent_target_base<'c: 'info, 'info>(
     let mut amm_inventories: Vec<AmmInventoryAndPrices> =
         Vec::with_capacity(amm_cache.len() as usize);
     for (idx, cache_info) in amm_cache.iter().enumerate() {
+        if cache_info.lp_status_for_perp_market == 0 {
+            continue;
+        }
         if !is_oracle_valid_for_action(
             OracleValidity::try_from(cache_info.oracle_validity)?,
             Some(DriftAction::UpdateLpConstituentTargetBase),
@@ -126,7 +129,6 @@ pub fn handle_update_constituent_target_base<'c: 'info, 'info>(
         }
 
         amm_inventories.push(AmmInventoryAndPrices {
-            perp_market_index: idx as u16,
             inventory: cache_info.position,
             price: cache_info.oracle_price,
         });

programs/drift/src/state/lp_pool.rs

@@ -1188,7 +1188,6 @@ pub fn calculate_target_weight(
 
 /// Update target base based on amm_inventory and mapping
 pub struct AmmInventoryAndPrices {
-    pub perp_market_index: u16,
     pub inventory: i64,
     pub price: i64,
 }
@@ -1212,12 +1211,7 @@ impl<'a> AccountZeroCopyMut<'a, TargetsDatum, ConstituentTargetBaseFixed> {
 
         // Precompute notional by perp market index
         let mut notionals: Vec<i128> = Vec::with_capacity(amm_inventory_and_prices.len());
-        for &AmmInventoryAndPrices {
-            perp_market_index,
-            inventory,
-            price,
-        } in amm_inventory_and_prices.iter()
-        {
+        for &AmmInventoryAndPrices { inventory, price } in amm_inventory_and_prices.iter() {
             let notional = (inventory as i128)
                 .safe_mul(price as i128)?
                 .safe_div(BASE_PRECISION_I128)?;

programs/drift/src/state/lp_pool/tests.rs

@@ -70,22 +70,18 @@ mod tests {
 
         let amm_inventory_and_price: Vec<AmmInventoryAndPrices> = vec![
             AmmInventoryAndPrices {
-                perp_market_index: 0,
                 inventory: 4 * BASE_PRECISION_I64,
                 price: 100_000 * PRICE_PRECISION_I64,
             }, // $400k BTC
             AmmInventoryAndPrices {
-                perp_market_index: 1,
                 inventory: 2000 * BASE_PRECISION_I64,
                 price: 200 * PRICE_PRECISION_I64,
             }, // $400k SOL
             AmmInventoryAndPrices {
-                perp_market_index: 2,
                 inventory: 200 * BASE_PRECISION_I64,
                 price: 1500 * PRICE_PRECISION_I64,
             }, // $300k ETH
             AmmInventoryAndPrices {
-                perp_market_index: 3,
                 inventory: 16500 * BASE_PRECISION_I64,
                 price: PRICE_PRECISION_I64,
             }, // $16.5k FARTCOIN
@@ -186,7 +182,6 @@ mod tests {
         };
 
         let amm_inventory_and_prices: Vec<AmmInventoryAndPrices> = vec![AmmInventoryAndPrices {
-            perp_market_index: 0,
             inventory: 1_000_000,
             price: 1_000_000,
         }];
@@ -254,7 +249,6 @@ mod tests {
 
         let price = PRICE_PRECISION_I64;
         let amm_inventory_and_prices: Vec<AmmInventoryAndPrices> = vec![AmmInventoryAndPrices {
-            perp_market_index: 0,
             inventory: BASE_PRECISION_I64,
             price,
         }];
@@ -344,7 +338,6 @@ mod tests {
         };
 
         let amm_inventory_and_prices: Vec<AmmInventoryAndPrices> = vec![AmmInventoryAndPrices {
-            perp_market_index: 0,
             inventory: 1_000_000_000,
             price: 1_000_000,
         }];
@@ -433,7 +426,6 @@ mod tests {
         };
 
         let amm_inventory_and_prices: Vec<AmmInventoryAndPrices> = vec![AmmInventoryAndPrices {
-            perp_market_index: 0,
             inventory: 1_000_000,
             price: 142_000_000,
         }];

tests/lpPoolCUs.ts

@@ -256,8 +256,6 @@ describe('LP Pool', () => {
 		await adminClient.initializeLpPool(
 			lpPoolName,
 			ZERO,
-			ZERO,
-			new BN(3600),
 			new BN(1_000_000_000_000).mul(QUOTE_PRECISION),
 			new BN(1_000_000).mul(QUOTE_PRECISION),
 			new Keypair()