address renaming comments

Author: moosecat2

programs/drift/src/ids.rs

@@ -91,11 +91,6 @@ pub mod lighthouse {
     declare_id!("L2TExMFKdjpN9kozasaurPirfHy9P8sbXoAN1qA3S95");
 }
 
-pub mod usdc_mint {
-    use solana_program::declare_id;
-    declare_id!("BJE5MMbqXjVwjAF7oxwPYXnTXDyspzZyt4vwenNw5ruG");
-}
-
 pub mod mm_oracle_crank_wallet {
     use solana_program::declare_id;
     #[cfg(not(feature = "anchor-test"))]
@@ -114,4 +109,4 @@ pub mod amm_spread_adjust_wallet {
     declare_id!("w1DrTeayRMutAiwzfJfK9zLcpkF7RzwPy1BLCgQA1aF");
     #[cfg(feature = "anchor-test")]
     declare_id!("1ucYHAGrBbi1PaecC4Ptq5ocZLWGLBmbGWysoDGNB1N");
-}
+}

programs/drift/src/instructions/lp_admin.rs

@@ -3,7 +3,7 @@ use crate::controller::token::{receive, send_from_program_vault_with_signature_s
 use crate::error::ErrorCode;
 use crate::ids::admin_hot_wallet;
 use crate::instructions::optional_accounts::get_token_mint;
-use crate::math::constants::PRICE_PRECISION_U64;
+use crate::math::constants::{PRICE_PRECISION_U64, QUOTE_SPOT_MARKET_INDEX};
 use crate::math::safe_math::SafeMath;
 use crate::state::lp_pool::{
     AmmConstituentDatum, AmmConstituentMapping, Constituent, ConstituentCorrelations,
@@ -23,7 +23,7 @@ use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
 use crate::ids::{
     jupiter_mainnet_3, jupiter_mainnet_4, jupiter_mainnet_6, lighthouse, marinade_mainnet,
-    serum_program, usdc_mint,
+    serum_program,
 };
 
 use crate::state::traits::Size;
@@ -198,7 +198,7 @@ pub fn handle_initialize_constituent<'info>(
     constituent.xi = xi;
     lp_pool.constituents += 1;
 
-    if constituent.mint.eq(&usdc_mint::ID) {
+    if constituent.spot_market_index == QUOTE_SPOT_MARKET_INDEX {
         lp_pool.quote_consituent_index = constituent.constituent_index;
     }
 
@@ -389,7 +389,11 @@ pub fn handle_update_lp_pool_params<'info>(
     }
 
     if let Some(whitelist_mint) = lp_pool_params.whitelist_mint {
-        msg!("whitelist_mint: {:?} -> {:?}", lp_pool.whitelist_mint, whitelist_mint);
+        msg!(
+            "whitelist_mint: {:?} -> {:?}",
+            lp_pool.whitelist_mint,
+            whitelist_mint
+        );
         lp_pool.whitelist_mint = whitelist_mint;
     }
 

programs/drift/src/instructions/lp_pool.rs

@@ -47,7 +47,7 @@ use std::convert::TryFrom;
 
 use solana_program::sysvar::clock::Clock;
 
-use super::optional_accounts::{load_maps, AccountMaps, get_whitelist_token};
+use super::optional_accounts::{get_whitelist_token, load_maps, AccountMaps};
 use crate::controller::spot_balance::update_spot_market_cumulative_interest;
 use crate::controller::token::{receive, send_from_program_vault_with_signature_seeds};
 use crate::instructions::constraints::*;
@@ -1327,7 +1327,7 @@ pub fn handle_deposit_to_program_vault<'c: 'info, 'info>(
         constituent.last_oracle_slot = oracle_data_slot;
     }
     constituent.sync_token_balance(ctx.accounts.constituent_token_account.amount);
-    let balance_before = constituent.get_full_balance(&spot_market)?;
+    let balance_before = constituent.get_full_token_amount(&spot_market)?;
 
     controller::token::send_from_program_vault_with_signature_seeds(
         &ctx.accounts.token_program,
@@ -1367,7 +1367,7 @@ pub fn handle_deposit_to_program_vault<'c: 'info, 'info>(
         "Spot market vault amount mismatch after deposit"
     )?;
 
-    let balance_after = constituent.get_full_balance(&spot_market)?;
+    let balance_after = constituent.get_full_token_amount(&spot_market)?;
     let balance_diff_notional = if spot_market.decimals > 6 {
         balance_after
             .abs_diff(balance_before)
@@ -1431,7 +1431,7 @@ pub fn handle_withdraw_from_program_vault<'c: 'info, 'info>(
         constituent.last_oracle_slot = oracle_data_slot;
     }
     constituent.sync_token_balance(ctx.accounts.constituent_token_account.amount);
-    let balance_before = constituent.get_full_balance(&spot_market)?;
+    let balance_before = constituent.get_full_token_amount(&spot_market)?;
 
     // Can only borrow up to the max
     let bl_token_balance = constituent.spot_balance.get_token_amount(&spot_market)?;
@@ -1487,7 +1487,7 @@ pub fn handle_withdraw_from_program_vault<'c: 'info, 'info>(
     )?;
 
     // Verify withdraw fully accounted for in BLPosition
-    let balance_after = constituent.get_full_balance(&spot_market)?;
+    let balance_after = constituent.get_full_token_amount(&spot_market)?;
 
     let balance_diff_notional = if spot_market.decimals > 6 {
         balance_after

programs/drift/src/state/lp_pool.rs

@@ -697,13 +697,13 @@ impl LPPool {
             let spot_market = spot_market_map.get_ref(&constituent.spot_market_index)?;
 
             let constituent_aum = constituent
-                .get_full_balance(&spot_market)?
+                .get_full_token_amount(&spot_market)?
                 .safe_mul(constituent.last_oracle_price as i128)?
                 .safe_div(10_i128.pow(spot_market.decimals))?;
             msg!(
                 "constituent: {}, balance: {}, aum: {}, deriv index: {}, bl token balance {}, bl balance type {}, vault balance: {}",
                 constituent.constituent_index,
-                constituent.get_full_balance(&spot_market)?,
+                constituent.get_full_token_amount(&spot_market)?,
                 constituent_aum,
                 constituent.constituent_derivative_index,
                 constituent.spot_balance.get_token_amount(&spot_market)?,
@@ -880,7 +880,7 @@ impl Size for Constituent {
 impl Constituent {
     /// Returns the full balance of the Constituent, the total of the amount in Constituent's token
     /// account and in Drift Borrow-Lend.
-    pub fn get_full_balance(&self, spot_market: &SpotMarket) -> DriftResult<i128> {
+    pub fn get_full_token_amount(&self, spot_market: &SpotMarket) -> DriftResult<i128> {
         let token_amount = self.spot_balance.get_signed_token_amount(spot_market)?;
         let vault_balance = self.vault_token_balance.cast::<i128>()?;
         token_amount.safe_add(vault_balance)
@@ -924,7 +924,7 @@ impl Constituent {
         token_amount: i128,
     ) -> DriftResult<i128> {
         let token_precision = 10_i128.pow(self.decimals as u32);
-        let balance = self.get_full_balance(spot_market)?.cast::<i128>()?;
+        let balance = self.get_full_token_amount(spot_market)?.cast::<i128>()?;
         let amount = balance.safe_add(token_amount)?;
         let value_usd = amount.safe_mul(price.cast::<i128>()?)?;
         value_usd.safe_div(token_precision)

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

@@ -623,7 +623,7 @@ mod swap_tests {
             ..SpotMarket::default()
         };
 
-        let full_balance = c.get_full_balance(&spot_market).unwrap();
+        let full_balance = c.get_full_token_amount(&spot_market).unwrap();
         assert_eq!(full_balance, 1_000_000);
 
         // 1/10 = 10%