use transmuter math crate in transmuter

osmosis-labs · Sep 10, 2024 · 13b8ae5 · 13b8ae5
1 parent 630ead2
commit 13b8ae5
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 1,243 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/transmuter/Cargo.toml b/contracts/transmuter/Cargo.toml
@@ -52,6 +52,7 @@ schemars = "0.8.12"
 serde = {version = "1.0.183", default-features = false, features = ["derive"]}
 sylvia = "0.10.1"
 thiserror = {version = "1.0.44"}
+transmuter_math = {version = "1.0.0", path = "../../packages/transmuter_math"}
 
 [dev-dependencies]
 itertools = "0.12.0"

diff --git a/contracts/transmuter/src/contract.rs b/contracts/transmuter/src/contract.rs
@@ -59,7 +59,7 @@ pub mod key {
 #[sv::error(ContractError)]
 impl Transmuter<'_> {
     /// Create a Transmuter instance.
-    pub const fn new() -> Self {
+    pub const fn default() -> Self {
         Self {
             active_status: Item::new(key::ACTIVE_STATUS),
             pool: Item::new(key::POOL),
@@ -1069,7 +1069,7 @@ mod tests {
         for denom in ["uosmo", "uion"] {
             assert_dirty_change_limiters_by_denom!(
                 denom,
-                Transmuter::new().limiters,
+                Transmuter::default().limiters,
                 deps.as_ref().storage
             );
         }
@@ -1135,7 +1135,7 @@ mod tests {
         execute(deps.as_mut(), env.clone(), info, add_assets_msg).unwrap();
 
         let reset_at = env.block.time;
-        let transmuter = Transmuter::new();
+        let transmuter = Transmuter::default();
 
         // Reset change limiter states if new assets are added
         for denom in ["uosmo", "uion"] {
@@ -1611,7 +1611,7 @@ mod tests {
         );
 
         assert_eq!(
-            Transmuter::new()
+            Transmuter::default()
                 .limiters
                 .list_limiters_by_denom(&deps.storage, "wbtc")
                 .unwrap(),
@@ -1622,7 +1622,7 @@ mod tests {
             assert_reset_change_limiters_by_denom!(
                 denom,
                 env.block.time,
-                Transmuter::new(),
+                Transmuter::default(),
                 deps.as_ref().storage
             );
         }
@@ -1717,7 +1717,7 @@ mod tests {
 
         // still has all the limiters
         assert_eq!(
-            Transmuter::new()
+            Transmuter::default()
                 .limiters
                 .list_limiters_by_denom(&deps.storage, "tbtc")
                 .unwrap()
@@ -1739,7 +1739,7 @@ mod tests {
     }
 
     fn total_liquidity_of(denom: &str, storage: &dyn Storage) -> Coin {
-        Transmuter::new()
+        Transmuter::default()
             .pool
             .load(storage)
             .unwrap()
@@ -1779,7 +1779,7 @@ mod tests {
         // Manually set alloyed denom
         let alloyed_denom = "uosmo".to_string();
 
-        let transmuter = Transmuter::new();
+        let transmuter = Transmuter::default();
         transmuter
             .alloyed_asset
             .set_alloyed_denom(&mut deps.storage, &alloyed_denom)

diff --git a/contracts/transmuter/src/error.rs b/contracts/transmuter/src/error.rs
@@ -200,6 +200,9 @@ pub enum ContractError {
     #[error("{0}")]
     MathError(#[from] MathError),
 
+    #[error("{0}")]
+    TrasnmuterMathError(#[from] transmuter_math::TransmuterMathError),
+
     /// This error should never occur
     #[error("")]
     Never,

diff --git a/contracts/transmuter/src/lib.rs b/contracts/transmuter/src/lib.rs
@@ -26,7 +26,7 @@ mod entry_points {
     use crate::migrations;
     use crate::sudo::SudoMsg;
 
-    const CONTRACT: Transmuter = Transmuter::new();
+    const CONTRACT: Transmuter = Transmuter::default();
 
     macro_rules! ensure_active_status {
         ($msg:expr, $deps:expr, $env:expr, except: $pattern:pat) => {

diff --git a/contracts/transmuter/src/limiter/limiters.rs → contracts/transmuter/src/limiter.rs b/contracts/transmuter/src/limiter/limiters.rs → contracts/transmuter/src/limiter.rs
@@ -1,12 +1,10 @@
 use std::collections::HashMap;
 
+use crate::ContractError;
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{ensure, Decimal, StdError, Storage, Timestamp, Uint64};
 use cw_storage_plus::Map;
-
-use crate::ContractError;
-
-use super::division::Division;
+use transmuter_math::Division;
 
 /// Maximum number of divisions allowed in a window.
 /// This limited so that the contract can't be abused by setting a large division count,
@@ -617,7 +615,7 @@ macro_rules! assert_reset_change_limiters_by_denom {
                 let value = *weights.get($denom).unwrap();
                 assert_eq!(
                     limiter.divisions(),
-                    &[$crate::limiter::Division::new($reset_at, $reset_at, value, value).unwrap()]
+                    &[transmuter_math::Division::new($reset_at, $reset_at, value, value).unwrap()]
                 )
             };
         }