@@ -4,7 +4,6 @@ use anchor_lang::prelude::*;
44
55use crate :: state:: state:: { State , ValidityGuardRails } ;
66use std:: cmp:: max;
7- use std:: u128;
87
98use crate :: controller:: position:: PositionDirection ;
109use crate :: error:: { DriftResult , ErrorCode } ;
@@ -248,21 +247,22 @@ pub fn _calc_high_leverage_mode_initial_margin_ratio_from_size(
248247) -> DriftResult < u32 > {
249248 let result = if size_adj_margin_ratio < pre_size_adj_margin_ratio {
250249 let size_pct_discount_factor = PERCENTAGE_PRECISION . safe_sub (
251- ( ( pre_size_adj_margin_ratio as u128 )
252- . safe_sub ( size_adj_margin_ratio as u128 ) ?
250+ ( ( pre_size_adj_margin_ratio. cast :: < u128 > ( ) ? )
251+ . safe_sub ( size_adj_margin_ratio. cast :: < u128 > ( ) ? ) ?
253252 . safe_mul ( PERCENTAGE_PRECISION ) ?
254- . safe_div ( ( pre_size_adj_margin_ratio / 5 ) as u128 ) ?) ,
253+ . safe_div ( ( pre_size_adj_margin_ratio. safe_div ( 5 ) ? ) . cast :: < u128 > ( ) ? ) ?) ,
255254 ) ?;
256255
257256 let hlm_margin_delta = pre_size_adj_margin_ratio
258257 . saturating_sub ( default_margin_ratio)
259258 . max ( 1 ) ;
260259
261260 let hlm_margin_delta_proportion = get_proportion_u128 (
262- hlm_margin_delta as u128 ,
261+ hlm_margin_delta. cast ( ) ? ,
263262 size_pct_discount_factor,
264263 PERCENTAGE_PRECISION ,
265- ) ? as u32 ;
264+ ) ?
265+ . cast :: < u32 > ( ) ?;
266266 hlm_margin_delta_proportion + default_margin_ratio
267267 } else if size_adj_margin_ratio == pre_size_adj_margin_ratio {
268268 default_margin_ratio
@@ -520,7 +520,7 @@ impl PerpMarket {
520520 pre_size_adj_margin_ratio,
521521 size_adj_margin_ratio,
522522 default_margin_ratio,
523- )
523+ ) ?
524524 } else {
525525 let size_adj_margin_ratio = calculate_size_premium_liability_weight (
526526 size,
@@ -530,7 +530,7 @@ impl PerpMarket {
530530 true ,
531531 ) ?;
532532
533- Ok ( default_margin_ratio. max ( size_adj_margin_ratio) )
533+ default_margin_ratio. max ( size_adj_margin_ratio)
534534 } ;
535535
536536 Ok ( margin_ratio)
0 commit comments