make muldiv pub, remove some unnecessary copying

EkuboProtocol · Sep 17, 2024 · 3dbbf89 · 3dbbf89
1 parent c9fb86b
commit 3dbbf89
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/src/math/muldiv.rs b/src/math/muldiv.rs
@@ -38,7 +38,7 @@ impl TryFrom<U512> for U256 {
     }
 }
 
-pub(crate) fn muldiv(x: U256, y: U256, d: U256, round_up: bool) -> Result<U256, MuldivError> {
+pub fn muldiv(x: U256, y: U256, d: U256, round_up: bool) -> Result<U256, MuldivError> {
     if d.is_zero() {
         return Err(MuldivError::DenominatorZero);
     }
@@ -64,7 +64,6 @@ pub(crate) fn muldiv(x: U256, y: U256, d: U256, round_up: bool) -> Result<U256,
     result.try_into().map_err(|_| MuldivError::Overflow)
 }
 
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -128,7 +127,9 @@ mod tests {
         let d = U256::from(1);
         let result = muldiv(x, y, d, false).unwrap();
 
-        let expected = U256::from_dec_str("121932631137021795226185032733622923332237463801111263526900").unwrap();
+        let expected =
+            U256::from_dec_str("121932631137021795226185032733622923332237463801111263526900")
+                .unwrap();
         assert_eq!(result, expected);
     }
 
@@ -168,7 +169,6 @@ mod tests {
         assert_eq!(result, expected);
     }
 
-
     #[test]
     fn test_muldiv_max_values_no_rounding() {
         // Test with maximum U256 values that result in a valid U256 output
@@ -195,7 +195,13 @@ mod tests {
         let y = U256::from(1);
         let d = U256::from(2);
         let result = muldiv(x, y, d, true);
-        assert_eq!(result.unwrap(), U256::from_dec_str("57896044618658097711785492504343953926634992332820282019728792003956564819968").unwrap());
+        assert_eq!(
+            result.unwrap(),
+            U256::from_dec_str(
+                "57896044618658097711785492504343953926634992332820282019728792003956564819968"
+            )
+            .unwrap()
+        );
     }
 
     #[test]
@@ -257,7 +263,10 @@ mod tests {
         let result = muldiv(x, y, d, true);
         assert_eq!(
             result.unwrap(),
-            U256::from_dec_str("115792089237316195423570985008687907853269984665640564039457584007913129639935").unwrap()
+            U256::from_dec_str(
+                "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+            )
+            .unwrap()
         );
     }
 
@@ -287,7 +296,8 @@ mod tests {
         // Test where intermediate multiplication is large but result fits in U256
         let x = U256::from_dec_str("123456789012345678901234567890").unwrap();
         let y = U256::from_dec_str("98765432109876543210987654321").unwrap();
-        let d = U256::from_dec_str("1219326311370217952261850327336229233322374638011112635269").unwrap();
+        let d = U256::from_dec_str("1219326311370217952261850327336229233322374638011112635269")
+            .unwrap();
         let result = muldiv(x, y, d, false).unwrap();
         assert_eq!(result, U256::from(10));
     }

diff --git a/src/quoting/base_pool.rs b/src/quoting/base_pool.rs
@@ -124,8 +124,8 @@ impl Pool for BasePool {
     type QuoteError = BasePoolQuoteError;
     type Meta = ();
 
-    fn get_key(&self) -> NodeKey {
-        self.key
+    fn get_key(&self) -> &NodeKey {
+        &self.key
     }
 
     fn get_state(&self) -> Self::State {

diff --git a/src/quoting/oracle_pool.rs b/src/quoting/oracle_pool.rs
@@ -89,7 +89,7 @@ impl Pool for OraclePool {
     type QuoteError = BasePoolQuoteError;
     type Meta = BlockTimestamp;
 
-    fn get_key(&self) -> NodeKey {
+    fn get_key(&self) -> &NodeKey {
         self.base_pool.get_key()
     }
 

diff --git a/src/quoting/twamm_pool.rs b/src/quoting/twamm_pool.rs
@@ -124,7 +124,7 @@ impl Pool for TwammPool {
     type QuoteError = TwammPoolQuoteError;
     type Meta = BlockTimestamp;
 
-    fn get_key(&self) -> NodeKey {
+    fn get_key(&self) -> &NodeKey {
         self.base_pool.get_key()
     }
 
@@ -209,7 +209,7 @@ impl Pool for TwammPool {
                     token0_sale_rate,
                     token1_sale_rate,
                     time_elapsed as u32,
-                    fee,
+                    *fee,
                 )
                 .ok_or(TwammPoolQuoteError::FailedCalculateNextSqrtRatio)?;
 
@@ -226,7 +226,7 @@ impl Pool for TwammPool {
                             amount: amount
                                 .to_i128()
                                 .ok_or(TwammPoolQuoteError::SaleAmountOverflow)?,
-                            token,
+                            token: *token,
                         },
                         sqrt_ratio_limit: Some(next_sqrt_ratio),
                         override_state: base_pool_state_override,

diff --git a/src/quoting/types.rs b/src/quoting/types.rs
@@ -56,7 +56,7 @@ pub trait Pool: Send + Sync {
     // Any additional data that is required to compute a quote for this pool, e.g. the block timestamp
     type Meta: Copy;
 
-    fn get_key(&self) -> NodeKey;
+    fn get_key(&self) -> &NodeKey;
 
     fn get_state(&self) -> Self::State;