working loop multiple base amounts test

Author: 0xbigz

programs/drift/src/state/perp_market.rs

@@ -477,7 +477,7 @@ impl PerpMarket {
         };
 
         let cap_size_premium =
-            !is_high_leverage_user || margin_type != MarginRequirementType::Initial;
+            !is_high_leverage_user || margin_type == MarginRequirementType::Maintenance;
         let size_adj_margin_ratio = calculate_size_premium_liability_weight(
             size,
             self.imf_factor,
@@ -486,20 +486,8 @@ impl PerpMarket {
             cap_size_premium,
         )?;
 
-        crate::dlog!(
-            is_high_leverage_user,
-            cap_size_premium,
-            size_adj_margin_ratio,
-            pre_size_adj_margin_ratio,
-            default_margin_ratio
-        );
-
         let margin_ratio = if cap_size_premium {
-            if size_adj_margin_ratio >= pre_size_adj_margin_ratio {
-                default_margin_ratio.max(size_adj_margin_ratio)
-            } else {
-                default_margin_ratio
-            }
+            default_margin_ratio.max(size_adj_margin_ratio)
         } else {
             if size_adj_margin_ratio < pre_size_adj_margin_ratio {
                 let size_pct_discount_factor = PERCENTAGE_PRECISION.safe_sub(
@@ -525,8 +513,10 @@ impl PerpMarket {
                     size_pct_discount_factor
                 );
                 hlm_margin_delta_proportion + default_margin_ratio
-            } else {
+            } else if size_adj_margin_ratio == pre_size_adj_margin_ratio {
                 default_margin_ratio
+            } else {
+                size_adj_margin_ratio
             }
         };
 

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

@@ -84,21 +84,54 @@ mod get_margin_ratio {
         let margin_ratio_initial = perp_market
             .get_margin_ratio(BASE_PRECISION, MarginRequirementType::Initial, true)
             .unwrap();
+        assert_eq!(margin_ratio_initial, MARGIN_PRECISION / 50);
 
         let margin_ratio_maintenance = perp_market
             .get_margin_ratio(BASE_PRECISION, MarginRequirementType::Maintenance, true)
             .unwrap();
 
+        assert_eq!(margin_ratio_maintenance, MARGIN_PRECISION / 100);
+
         let margin_ratio_fill = perp_market
             .get_margin_ratio(BASE_PRECISION, MarginRequirementType::Fill, true)
             .unwrap();
 
-        assert_eq!(margin_ratio_initial, MARGIN_PRECISION / 50);
         assert_eq!(
             margin_ratio_fill,
             (MARGIN_PRECISION / 50 + MARGIN_PRECISION / 100) / 2
         );
-        assert_eq!(margin_ratio_maintenance, MARGIN_PRECISION / 100);
+    }
+
+    #[test]
+    fn smart_hlm_size_loop() {
+        let perp_market = PerpMarket {
+            margin_ratio_initial: MARGIN_PRECISION / 20,
+            margin_ratio_maintenance: MARGIN_PRECISION / 33,
+            high_leverage_margin_ratio_initial: (MARGIN_PRECISION / 100) as u16,
+            high_leverage_margin_ratio_maintenance: (MARGIN_PRECISION / 151) as u16,
+            imf_factor: 50,
+            ..PerpMarket::default()
+        };
+
+        let mut cnt = 0;
+
+        for i in 1..1_000 {
+            let hlm_margin_ratio_initial = perp_market
+                .get_margin_ratio(BASE_PRECISION * i * 1000, MarginRequirementType::Initial, true)
+                .unwrap();
+
+            let margin_ratio_initial = perp_market
+                .get_margin_ratio(BASE_PRECISION * i * 1000, MarginRequirementType::Initial, false)
+                .unwrap();
+
+            if margin_ratio_initial != perp_market.margin_ratio_initial {
+                // crate::msg!("{}", BASE_PRECISION * i);
+                assert_eq!(hlm_margin_ratio_initial, margin_ratio_initial);
+                cnt += 1;
+            }
+        }
+
+        assert_eq!(cnt, 959_196 / 1_000);
     }
 
     #[test]
@@ -112,6 +145,12 @@ mod get_margin_ratio {
             ..PerpMarket::default()
         };
 
+        let normal_margin_ratio_initial = perp_market
+            .get_margin_ratio(BASE_PRECISION * 1000000, MarginRequirementType::Initial, false)
+            .unwrap();
+
+        assert_eq!(normal_margin_ratio_initial, 1300);
+
         let hlm_margin_ratio_initial = perp_market
             .get_margin_ratio(BASE_PRECISION / 10, MarginRequirementType::Initial, true)
             .unwrap();
@@ -138,8 +177,6 @@ mod get_margin_ratio {
             .unwrap();
         assert_eq!(hlm_margin_ratio_maint, 67); // hardly changed
 
-
-
         let hlm_margin_ratio_maint = perp_market
             .get_margin_ratio(
                 BASE_PRECISION * 300000,