feat: swap token test

primitivefinance · Apr 25, 2024 · fd789f4 · fd789f4
1 parent 3126bff
commit fd789f4
Show file tree

Hide file tree

Showing 23 changed files with 66 additions and 176 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kit/Cargo.toml b/kit/Cargo.toml
@@ -29,10 +29,9 @@ serde_json = "1.0.114"
 # Errors and tracing
 anyhow = "1.0.81"
 tracing = "0.1.40"
-tracing-subscriber = "0.3.18"
 
-# CLI
-clap = { version = "4.5.1", features = ["derive"] }
+[dev-dependencies]
+tracing-subscriber = "0.3.18"
 
 [[bin]]
 name = "kit"

diff --git a/kit/src/behaviors/deploy.rs b/kit/src/behaviors/deploy.rs
@@ -41,26 +41,28 @@ impl Behavior<()> for Deploy {
         let geometric_mean = GeometricMean::deploy(client.clone(), dfmm.address())?
             .send()
             .await?;
-        let geometric_mean_solver = GeometricMeanSolver::deploy(client.clone(), dfmm.address())?
-            .send()
-            .await?;
+        let geometric_mean_solver =
+            GeometricMeanSolver::deploy(client.clone(), geometric_mean.address())?
+                .send()
+                .await?;
         let log_normal = LogNormal::deploy(client.clone(), dfmm.address())?
             .send()
             .await?;
-        let log_normal_solver = LogNormalSolver::deploy(client.clone(), dfmm.address())?
+        let log_normal_solver = LogNormalSolver::deploy(client.clone(), log_normal.address())?
             .send()
             .await?;
         let constant_sum = ConstantSum::deploy(client.clone(), dfmm.address())?
             .send()
             .await?;
-        let constant_sum_solver = ConstantSumSolver::deploy(client.clone(), dfmm.address())?
-            .send()
-            .await?;
+        let constant_sum_solver =
+            ConstantSumSolver::deploy(client.clone(), constant_sum.address())?
+                .send()
+                .await?;
         let n_token_geometric_mean = NTokenGeometricMean::deploy(client.clone(), dfmm.address())?
             .send()
             .await?;
         let n_token_geometric_mean_solver =
-            NTokenGeometricMeanSolver::deploy(client.clone(), dfmm.address())?
+            NTokenGeometricMeanSolver::deploy(client.clone(), n_token_geometric_mean.address())?
                 .send()
                 .await?;
         let deployment_data = DeploymentData {

diff --git a/kit/src/behaviors/swap/mod.rs b/kit/src/behaviors/swap/mod.rs
@@ -1,5 +1,5 @@
 use self::{
-    bindings::{dfmm::dfmm, erc20::ERC20},
+    bindings::erc20::ERC20,
     pool::InputToken,
 };
 use super::*;
@@ -138,6 +138,7 @@ where
 
     default async fn process(&mut self, event: E) -> Result<ControlFlow> {
         if let Some((swap_amount, input)) = self.swap_type.compute_swap_amount(event) {
+            debug!("Found the swap amounts: {:?}", swap_amount);
             self.data.pool.swap(swap_amount, input).await?;
         }
 

diff --git a/kit/src/behaviors/token.rs b/kit/src/behaviors/token.rs
@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+
 use super::*;
 
 #[derive(Deserialize, Serialize, Clone, Debug)]