Macro & math updates

Author: grod220

packages/std/src/errors/mod.rs

@@ -5,7 +5,7 @@ mod verification_error;
 
 pub use recover_pubkey_error::RecoverPubkeyError;
 pub use std_error::{
-    CheckedFromRatioError, CheckedMultiplyFractionalError, CheckedMultiplyRatioError,
+    CheckedFromRatioError, CheckedMultiplyFractionError, CheckedMultiplyRatioError,
     ConversionOverflowError, DivideByZeroError, OverflowError, OverflowOperation,
     RoundUpOverflowError, StdError, StdResult,
 };

packages/std/src/errors/std_error.rs

@@ -557,7 +557,7 @@ impl DivideByZeroError {
 }
 
 #[derive(Error, Debug, PartialEq, Eq)]
-pub enum CheckedMultiplyFractionalError {
+pub enum CheckedMultiplyFractionError {
     #[error("{0}")]
     DivideByZero(#[from] DivideByZeroError),
 

packages/std/src/lib.rs

@@ -46,7 +46,7 @@ pub use crate::ibc::{
 #[cfg(feature = "iterator")]
 pub use crate::iterator::{Order, Record};
 pub use crate::math::{
-    Decimal, Decimal256, Decimal256RangeExceeded, DecimalRangeExceeded, Fractional, Isqrt, Uint128,
+    Decimal, Decimal256, Decimal256RangeExceeded, DecimalRangeExceeded, Fraction, Isqrt, Uint128,
     Uint256, Uint512, Uint64,
 };
 pub use crate::never::Never;

packages/std/src/math/decimal.rs

@@ -12,7 +12,7 @@ use crate::errors::{
     OverflowOperation, RoundUpOverflowError, StdError,
 };
 
-use super::Fractional;
+use super::Fraction;
 use super::Isqrt;
 use super::{Uint128, Uint256};
 
@@ -359,7 +359,7 @@ impl Decimal {
     }
 }
 
-impl Fractional<Uint128> for Decimal {
+impl Fraction<Uint128> for Decimal {
     #[inline]
     fn numerator(&self) -> Uint128 {
         self.0

packages/std/src/math/decimal256.rs

@@ -13,7 +13,7 @@ use crate::errors::{
 };
 use crate::{Decimal, Uint512};
 
-use super::Fractional;
+use super::Fraction;
 use super::Isqrt;
 use super::Uint256;
 
@@ -376,7 +376,7 @@ impl Decimal256 {
     }
 }
 
-impl Fractional<Uint256> for Decimal256 {
+impl Fraction<Uint256> for Decimal256 {
     #[inline]
     fn numerator(&self) -> Uint256 {
         self.0

packages/std/src/math/fraction.rs

@@ -1,12 +1,7 @@
-use serde::{Deserialize, Serialize};
-
-use crate::errors::CheckedMultiplyFractionalError;
-use crate::Uint512;
-
 /// A fraction `p`/`q` with integers `p` and `q`.
 ///
 /// `p` is called the numerator and `q` is called the denominator.
-pub trait Fractional<T>: Sized {
+pub trait Fraction<T>: Sized {
     /// Returns the numerator `p`
     fn numerator(&self) -> T;
     /// Returns the denominator `q`
@@ -18,16 +13,7 @@ pub trait Fractional<T>: Sized {
     fn inv(&self) -> Option<Self>;
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
-pub struct Fraction<T>(T, T);
-
-impl<T> Fraction<T> {
-    pub fn new(numerator: T, denominator: T) -> Self {
-        Self(numerator, denominator)
-    }
-}
-
-impl<T: Clone> Fractional<T> for Fraction<T> {
+impl<T: Clone> Fraction<T> for (T, T) {
     fn numerator(&self) -> T {
         self.0.clone()
     }
@@ -37,66 +23,46 @@ impl<T: Clone> Fractional<T> for Fraction<T> {
     }
 
     fn inv(&self) -> Option<Self> {
-        unimplemented!()
+        Some((self.1.clone(), self.0.clone()))
     }
 }
 
-pub trait FractionMath {
-    fn checked_mul_floored<F: Fractional<T>, T: Into<Uint512>>(
-        self,
-        rhs: F,
-    ) -> Result<Self, CheckedMultiplyFractionalError>
-    where
-        Self: Sized;
-
-    fn mul_floored<F: Fractional<T>, T: Into<Uint512>>(self, rhs: F) -> Self;
-
-    fn checked_mul_ceil<F: Fractional<T> + Clone, T: Into<Uint512>>(
-        self,
-        rhs: F,
-    ) -> Result<Self, CheckedMultiplyFractionalError>
-    where
-        Self: Sized;
-
-    fn mul_ceil<F: Fractional<T> + Clone, T: Into<Uint512>>(self, rhs: F) -> Self;
-}
-
 #[macro_export]
-macro_rules! fraction_math {
-    ($name:ident) => {
-        impl FractionMath for $name {
-            fn checked_mul_floored<F: Fractional<T>, T: Into<Uint512>>(
+macro_rules! impl_mul_fraction {
+    ($UintBase:ident, $UintLarger:ident) => {
+        impl $UintBase {
+            pub fn checked_mul_floored<F: Fraction<T>, T: Into<$UintBase>>(
                 self,
                 rhs: F,
-            ) -> Result<Self, CheckedMultiplyFractionalError> {
-                let res = Uint512::from(self)
-                    .checked_mul(rhs.numerator().into())?
-                    .checked_div(rhs.denominator().into())?;
+            ) -> Result<Self, CheckedMultiplyFractionError> {
+                let res = self
+                    .full_mul(rhs.numerator().into())
+                    .checked_div($UintLarger::from(rhs.denominator().into()))?;
                 Ok(res.try_into()?)
             }
 
-            fn mul_floored<F: Fractional<T>, T: Into<Uint512>>(self, rhs: F) -> Self {
+            pub fn mul_floored<F: Fraction<T>, T: Into<$UintBase>>(self, rhs: F) -> Self {
                 self.checked_mul_floored(rhs).unwrap()
             }
 
-            fn mul_ceil<F: Fractional<T> + Clone, T: Into<Uint512>>(self, rhs: F) -> Self {
-                self.checked_mul_ceil(rhs).unwrap()
-            }
-
-            fn checked_mul_ceil<F: Fractional<T> + Clone, T: Into<Uint512>>(
+            pub fn checked_mul_ceil<F: Fraction<T> + Clone, T: Into<$UintBase>>(
                 self,
                 rhs: F,
-            ) -> Result<Self, CheckedMultiplyFractionalError> {
+            ) -> Result<Self, CheckedMultiplyFractionError> {
                 let floor_result = self.checked_mul_floored(rhs.clone())?;
                 let numerator = rhs.numerator().into();
                 let denominator = rhs.denominator().into();
                 if !numerator.checked_rem(denominator)?.is_zero() {
-                    let ceil_result = Uint512::one().checked_add(floor_result.into())?;
+                    let ceil_result = $UintLarger::one().checked_add(floor_result.into())?;
                     Ok(ceil_result.try_into()?)
                 } else {
                     Ok(floor_result)
                 }
             }
+
+            pub fn mul_ceil<F: Fraction<T> + Clone, T: Into<$UintBase>>(self, rhs: F) -> Self {
+                self.checked_mul_ceil(rhs).unwrap()
+            }
         }
     };
 }

packages/std/src/math/mod.rs

@@ -9,7 +9,7 @@ mod uint64;
 
 pub use decimal::{Decimal, DecimalRangeExceeded};
 pub use decimal256::{Decimal256, Decimal256RangeExceeded};
-pub use fraction::Fractional;
+pub use fraction::Fraction;
 pub use isqrt::Isqrt;
 pub use uint128::Uint128;
 pub use uint256::Uint256;