Merge branch 'main' into min-reserve

Cardinal-Cryptography · Jul 4, 2024 · 9d99e65 · 9d99e65
2 parents fefffb9 + a9ae434
commit 9d99e65
Show file tree

Hide file tree

Showing 8 changed files with 308 additions and 560 deletions.
diff --git a/amm/drink-tests/Cargo.lock b/amm/drink-tests/Cargo.lock
diff --git a/amm/drink-tests/Cargo.toml b/amm/drink-tests/Cargo.toml
@@ -16,5 +16,9 @@ scale = { package = "parity-scale-codec", version = "3", default-features = fals
     "derive",
 ] }
 
+primitive-types = { version = "0.12.1", default-features = false, features = [
+    "codec",
+] }
+
 anyhow = "1.0.69"
 assert2 = "0.3.10"
diff --git a/amm/drink-tests/src/lib.rs b/amm/drink-tests/src/lib.rs
@@ -1,15 +1,11 @@
 #[cfg(test)]
-mod psp22;
-#[cfg(test)]
-mod rated_swap_tests;
-#[cfg(test)]
 #[allow(unused_imports)]
 mod mock_sazero_rate_contract;
 #[cfg(test)]
+mod psp22;
+#[cfg(test)]
 mod stable_pool_contract;
 #[cfg(test)]
 mod stable_swap_tests;
 #[cfg(test)]
-mod stable_min_reserve_tests;
-#[cfg(test)]
 mod utils;
diff --git a/amm/drink-tests/src/rated_swap_tests.rs b/amm/drink-tests/src/rated_swap_tests.rs