cargo fmt --

Author: crispheaney

programs/drift/src/instructions/user.rs

@@ -2958,7 +2958,6 @@ pub fn handle_update_user_perp_position_custom_margin_ratio(
     Ok(())
 }
 
-
 pub fn handle_update_user_margin_trading_enabled<'c: 'info, 'info>(
     ctx: Context<'_, '_, 'c, 'info, UpdateUser<'info>>,
     _sub_account_id: u16,

programs/drift/src/lib.rs

@@ -373,7 +373,12 @@ pub mod drift {
         perp_market_index: u16,
         margin_ratio: u16,
     ) -> Result<()> {
-        handle_update_user_perp_position_custom_margin_ratio(ctx, _sub_account_id, perp_market_index, margin_ratio)
+        handle_update_user_perp_position_custom_margin_ratio(
+            ctx,
+            _sub_account_id,
+            perp_market_index,
+            margin_ratio,
+        )
     }
 
     pub fn update_user_margin_trading_enabled<'c: 'info, 'info>(

programs/drift/src/math/margin.rs

@@ -537,11 +537,12 @@ pub fn calculate_margin_requirement_and_total_collateral_and_liability_info(
             0,
         )?;
 
-        let perp_position_custom_margin_ratio = if context.margin_type == MarginRequirementType::Initial {
-            market_position.max_margin_ratio as u32
-        } else {
-            0_u32
-        };
+        let perp_position_custom_margin_ratio =
+            if context.margin_type == MarginRequirementType::Initial {
+                market_position.max_margin_ratio as u32
+            } else {
+                0_u32
+            };
 
         let (
             perp_margin_requirement,
@@ -899,7 +900,6 @@ pub fn get_margin_calculation_for_disable_high_leverage_mode(
     oracle_map: &mut OracleMap,
 ) -> DriftResult<MarginCalculation> {
     let custom_margin_ratio_before = user.max_margin_ratio;
-    
 
     let mut perp_position_max_margin_ratio_map = BTreeMap::new();
     for (index, position) in user.perp_positions.iter_mut().enumerate() {

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

@@ -4452,11 +4452,10 @@ mod get_margin_calculation_for_disable_high_leverage_mode {
     use anchor_lang::Owner;
     use solana_program::pubkey::Pubkey;
 
-    use crate::{create_account_info, MARGIN_PRECISION};
+    use crate::create_anchor_account_info;
     use crate::math::constants::{
-        AMM_RESERVE_PRECISION, LIQUIDATION_FEE_PRECISION, PEG_PRECISION,
-        SPOT_BALANCE_PRECISION, SPOT_BALANCE_PRECISION_U64, SPOT_CUMULATIVE_INTEREST_PRECISION,
-        SPOT_WEIGHT_PRECISION,
+        AMM_RESERVE_PRECISION, LIQUIDATION_FEE_PRECISION, PEG_PRECISION, SPOT_BALANCE_PRECISION,
+        SPOT_BALANCE_PRECISION_U64, SPOT_CUMULATIVE_INTEREST_PRECISION, SPOT_WEIGHT_PRECISION,
     };
     use crate::math::margin::get_margin_calculation_for_disable_high_leverage_mode;
     use crate::state::oracle::{HistoricalOracleData, OracleSource};
@@ -4466,9 +4465,9 @@ mod get_margin_calculation_for_disable_high_leverage_mode {
     use crate::state::spot_market::{SpotBalanceType, SpotMarket};
     use crate::state::spot_market_map::SpotMarketMap;
     use crate::state::user::{Order, PerpPosition, SpotPosition, User};
-    use crate::test_utils::*;
     use crate::test_utils::get_pyth_price;
-    use crate::create_anchor_account_info;
+    use crate::test_utils::*;
+    use crate::{create_account_info, MARGIN_PRECISION};
 
     #[test]
     pub fn check_user_not_changed() {
@@ -4590,4 +4589,4 @@ mod get_margin_calculation_for_disable_high_leverage_mode {
         // should not change user
         assert_eq!(user, user_before);
     }
-}
+}

programs/drift/src/state/user.rs

@@ -619,14 +619,22 @@ impl User {
         return Ok(true);
     }
 
-    pub fn update_perp_position_max_margin_ratio(&mut self, market_index: u16, margin_ratio: u16) -> DriftResult<()> {
+    pub fn update_perp_position_max_margin_ratio(
+        &mut self,
+        market_index: u16,
+        margin_ratio: u16,
+    ) -> DriftResult<()> {
         if self.max_margin_ratio > margin_ratio as u32 {
             msg!("user.max_margin_ratio ({}) > margin_ratio ({}), setting user.max_margin_ratio to margin_ratio", self.max_margin_ratio, margin_ratio);
             self.max_margin_ratio = margin_ratio as u32;
         }
 
         let perp_position = self.force_get_perp_position_mut(market_index)?;
-        msg!("perp_position.max_margin_ratio ({}) -> {}", perp_position.max_margin_ratio, margin_ratio);
+        msg!(
+            "perp_position.max_margin_ratio ({}) -> {}",
+            perp_position.max_margin_ratio,
+            margin_ratio
+        );
         perp_position.max_margin_ratio = margin_ratio;
 
         Ok(())

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

@@ -2518,7 +2518,7 @@ mod force_get_user_perp_position_mut {
             let perp_position_mut = user.force_get_perp_position_mut(2).unwrap();
             assert_eq!(perp_position_mut.max_margin_ratio, 0);
         }
-        
+
         assert_eq!(user.perp_positions[0].market_index, 2);
         assert_eq!(user.perp_positions[0].max_margin_ratio, 0);
     }