replace spl-math with spl-math-utils in spl-token-swap

Author: kevinheavey

Cargo.lock

@@ -18,7 +18,7 @@ enum_dispatch = "0.3.13"
 num-derive = "0.4"
 num-traits = "0.2"
 solana-program = "2.1.0"
-spl-math = { version = "0.3", path = "../../libraries/math", features = [ "no-entrypoint" ] }
+spl-math-utils = { version = "0.1", path = "../../libraries/math-utils" }
 spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint" ] }
 spl-token-2022 = { version = "5.0.2", path = "../../token/program-2022", features = [ "no-entrypoint" ] }
 thiserror = "1.0"

token-swap/program/Cargo.toml

@@ -2,7 +2,7 @@
 use {
     arbitrary::Arbitrary,
     honggfuzz::fuzz,
-    spl_math::precise_number::PreciseNumber,
+    spl_math_utils::precise_number::PreciseNumber,
     spl_token::error::TokenError,
     spl_token_swap::{
         curve::{

token-swap/program/fuzz/src/instructions.rs

@@ -2,7 +2,7 @@
 
 #[cfg(feature = "fuzz")]
 use arbitrary::Arbitrary;
-use {crate::error::SwapError, spl_math::precise_number::PreciseNumber, std::fmt::Debug};
+use {crate::error::SwapError, spl_math_utils::precise_number::PreciseNumber, std::fmt::Debug};
 
 /// Initial amount of pool tokens for swap contract, hard-coded to something
 /// "sensible" given a maximum of u128.
@@ -194,7 +194,7 @@ pub trait CurveCalculator: Debug + DynPack {
 /// Test helpers for curves
 #[cfg(test)]
 pub mod test {
-    use {super::*, proptest::prelude::*, spl_math::uint::U256};
+    use {super::*, proptest::prelude::*, spl_math_utils::uint::U256};
 
     /// The epsilon for most curves when performing the conversion test,
     /// comparing a one-sided deposit to a swap + deposit.

token-swap/program/src/curve/calculator.rs

@@ -12,7 +12,7 @@ use {
         program_error::ProgramError,
         program_pack::{IsInitialized, Pack, Sealed},
     },
-    spl_math::{checked_ceil_div::CheckedCeilDiv, precise_number::PreciseNumber, uint::U256},
+    spl_math_utils::{checked_ceil_div::CheckedCeilDiv, precise_number::PreciseNumber, uint::U256},
 };
 
 /// Get the amount of pool tokens for the given amount of token A or B.

token-swap/program/src/curve/constant_price.rs

@@ -12,7 +12,7 @@ use {
         program_error::ProgramError,
         program_pack::{IsInitialized, Pack, Sealed},
     },
-    spl_math::{checked_ceil_div::CheckedCeilDiv, precise_number::PreciseNumber},
+    spl_math_utils::{checked_ceil_div::CheckedCeilDiv, precise_number::PreciseNumber},
 };
 
 /// ConstantProductCurve struct implementing CurveCalculator

token-swap/program/src/curve/constant_product.rs

@@ -19,7 +19,7 @@ use {
         program_error::ProgramError,
         program_pack::{IsInitialized, Pack, Sealed},
     },
-    spl_math::precise_number::PreciseNumber,
+    spl_math_utils::precise_number::PreciseNumber,
 };
 
 /// Offset curve, uses ConstantProduct under the hood, but adds an offset to