make calculated amount unsigned since we always return a positive value

moodysalem · moodysalem · commit e3d62b36aec4 · 2025-06-10T07:15:31.000+01:00
diff --git a/src/math/swap.rs b/src/math/swap.rs
@@ -7,7 +7,7 @@ use num_traits::Zero;
 #[derive(Debug, PartialEq)]
 pub struct SwapResult {
     pub consumed_amount: i128,
-    pub calculated_amount: i128,
+    pub calculated_amount: u128,
     pub sqrt_ratio_next: U256,
     pub fee_amount: u128,
 }
@@ -121,18 +121,14 @@ pub fn compute_step(
                     .ok_or(ComputeStepError::AmountBeforeFeeOverflow)?;
                 Ok(SwapResult {
                     consumed_amount: amount,
-                    calculated_amount: including_fee
-                        .try_into()
-                        .map_err(ComputeStepError::SignedIntegerOverflow)?,
+                    calculated_amount: including_fee,
                     sqrt_ratio_next,
                     fee_amount: including_fee - calculated_amount_excluding_fee,
                 })
             } else {
                 Ok(SwapResult {
                     consumed_amount: amount,
-                    calculated_amount: calculated_amount_excluding_fee
-                        .try_into()
-                        .map_err(ComputeStepError::SignedIntegerOverflow)?,
+                    calculated_amount: calculated_amount_excluding_fee,
                     sqrt_ratio_next,
                     fee_amount: amount.unsigned_abs() - price_impact_amount.unsigned_abs(),
                 })
@@ -163,9 +159,7 @@ pub fn compute_step(
                 .map_err(ComputeStepError::AmountDeltaError)?
                 .try_into()
                 .map_err(ComputeStepError::SignedIntegerOverflow)?,
-            calculated_amount: before_fee
-                .try_into()
-                .map_err(ComputeStepError::SignedIntegerOverflow)?,
+            calculated_amount: before_fee,
             fee_amount: before_fee - amount_after_fee,
             sqrt_ratio_next: sqrt_ratio_limit,
         })
@@ -181,9 +175,7 @@ pub fn compute_step(
             consumed_amount: before_fee
                 .try_into()
                 .map_err(ComputeStepError::SignedIntegerOverflow)?,
-            calculated_amount: calculated_amount
-                .try_into()
-                .map_err(ComputeStepError::SignedIntegerOverflow)?,
+            calculated_amount: calculated_amount,
             fee_amount: before_fee - specified_amount,
             sqrt_ratio_next: sqrt_ratio_limit,
         })
@@ -214,8 +206,8 @@ mod tests {
         )
         .unwrap();
 
-        assert_eq!(result.calculated_amount, 0i128);
-        assert_eq!(result.consumed_amount, 0i128);
+        assert_eq!(result.calculated_amount, 0);
+        assert_eq!(result.consumed_amount, 0);
         assert_eq!(result.fee_amount, 0u128);
         assert_eq!(result.sqrt_ratio_next, sqrt_ratio);
     }
@@ -239,8 +231,8 @@ mod tests {
         )
         .unwrap();
 
-        assert_eq!(result.calculated_amount, 0i128);
-        assert_eq!(result.consumed_amount, 0i128);
+        assert_eq!(result.calculated_amount, 0);
+        assert_eq!(result.consumed_amount, 0);
         assert_eq!(result.fee_amount, 0u128);
         assert_eq!(result.sqrt_ratio_next, sqrt_ratio);
     }
@@ -264,8 +256,8 @@ mod tests {
         )
         .unwrap();
 
-        assert_eq!(result.calculated_amount, 0i128);
-        assert_eq!(result.consumed_amount, 0i128);
+        assert_eq!(result.calculated_amount, 0);
+        assert_eq!(result.consumed_amount, 0);
         assert_eq!(result.fee_amount, 0u128);
         assert_eq!(result.sqrt_ratio_next, sqrt_ratio);
     }
@@ -289,8 +281,8 @@ mod tests {
         )
         .unwrap();
 
-        assert_eq!(result.calculated_amount, 4_761i128);
-        assert_eq!(result.consumed_amount, 10_000i128);
+        assert_eq!(result.calculated_amount, 4_761);
+        assert_eq!(result.consumed_amount, 10_000);
         assert_eq!(result.fee_amount, 5_000u128);
         assert_eq!(
             result.sqrt_ratio_next,
@@ -317,8 +309,8 @@ mod tests {
         )
         .unwrap();
 
-        assert_eq!(result.calculated_amount, 4_761i128);
-        assert_eq!(result.consumed_amount, 10_000i128);
+        assert_eq!(result.calculated_amount, 4_761);
+        assert_eq!(result.consumed_amount, 10_000);
         assert_eq!(result.fee_amount, 5_000u128);
         assert_eq!(
             result.sqrt_ratio_next,
@@ -345,8 +337,8 @@ mod tests {
         )
         .unwrap();
 
-        assert_eq!(result.calculated_amount, 22_224i128);
-        assert_eq!(result.consumed_amount, -10_000i128);
+        assert_eq!(result.calculated_amount, 22_224);
+        assert_eq!(result.consumed_amount, -10_000);
         assert_eq!(result.fee_amount, 11_112u128);
         assert_eq!(
             result.sqrt_ratio_next,
@@ -373,8 +365,8 @@ mod tests {
         )
         .unwrap();
 
-        assert_eq!(result.calculated_amount, 22_224i128);
-        assert_eq!(result.consumed_amount, -10_000i128);
+        assert_eq!(result.calculated_amount, 22_224);
+        assert_eq!(result.consumed_amount, -10_000);
         assert_eq!(result.fee_amount, 11_112u128);
         assert_eq!(
             result.sqrt_ratio_next,
@@ -402,8 +394,8 @@ mod tests {
         )
         .unwrap();
 
-        assert_eq!(result.calculated_amount, 11_112i128);
-        assert_eq!(result.consumed_amount, -5_263i128);
+        assert_eq!(result.calculated_amount, 11_112);
+        assert_eq!(result.consumed_amount, -5_263);
         assert_eq!(result.fee_amount, 5_556u128);
         assert_eq!(result.sqrt_ratio_next, sqrt_ratio_limit);
     }
@@ -428,8 +420,8 @@ mod tests {
         )
         .unwrap();
 
-        assert_eq!(result.calculated_amount, 10_528i128);
-        assert_eq!(result.consumed_amount, -5_000i128);
+        assert_eq!(result.calculated_amount, 10_528);
+        assert_eq!(result.consumed_amount, -5_000);
         assert_eq!(result.fee_amount, 5_264u128);
         assert_eq!(result.sqrt_ratio_next, sqrt_ratio_limit);
     }
diff --git a/src/quoting/base_pool.rs b/src/quoting/base_pool.rs
@@ -506,7 +506,7 @@ impl Pool for BasePool {
             }
         };
 
-        let mut calculated_amount: i128 = 0;
+        let mut calculated_amount: u128 = 0;
         let mut fees_paid: u128 = 0;
         let mut initialized_ticks_crossed: u32 = 0;
         let mut amount_remaining = amount;
diff --git a/src/quoting/mev_resist_pool.rs b/src/quoting/mev_resist_pool.rs
@@ -168,7 +168,7 @@ impl Pool for MEVResistPool {
                 if params.token_amount.amount >= 0 {
                     // exact input, remove the additional fee from the output
                     calculated_amount -=
-                        compute_fee(calculated_amount as u128, fixed_point_additional_fee) as i128;
+                        compute_fee(calculated_amount as u128, fixed_point_additional_fee);
                 } else {
                     let input_amount_fee: u128 =
                         compute_fee(calculated_amount as u128, pool_config.fee);
@@ -177,7 +177,7 @@ impl Pool for MEVResistPool {
                     if let Some(bf) = amount_before_fee(input_amount, fixed_point_additional_fee) {
                         let fee = bf - input_amount;
                         // exact output, compute the additional fee for the output
-                        calculated_amount += fee as i128;
+                        calculated_amount += fee;
                     } else {
                         return Err(BasePoolQuoteError::FailedComputeSwapStep(
                             crate::math::swap::ComputeStepError::AmountBeforeFeeOverflow,
@@ -221,6 +221,7 @@ impl Pool for MEVResistPool {
     }
 }
 
+#[cfg(test)]
 mod tests {
     use alloc::vec;
 
diff --git a/src/quoting/types.rs b/src/quoting/types.rs
@@ -92,7 +92,7 @@ pub struct QuoteParams<S, M> {
 pub struct Quote<R, S> {
     pub is_price_increasing: bool,
     pub consumed_amount: i128,
-    pub calculated_amount: i128,
+    pub calculated_amount: u128,
     pub execution_resources: R,
     pub state_after: S,
     pub fees_paid: u128,

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ impl Pool for BasePool {`
`506`	`506`	`}`
`507`	`507`	`};`
`508`	`508`
`509`		`- let mut calculated_amount: i128 = 0;`
	`509`	`+ let mut calculated_amount: u128 = 0;`
`510`	`510`	`let mut fees_paid: u128 = 0;`
`511`	`511`	`let mut initialized_ticks_crossed: u32 = 0;`
`512`	`512`	`let mut amount_remaining = amount;`