[Tests]: Integrate defiplaza into the test environment.

radixdlt · Feb 27, 2024 · 87f5beb · 87f5beb
1 parent fd64efe
commit 87f5beb
Show file tree

Hide file tree

Showing 7 changed files with 318 additions and 11 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,6 +9,7 @@
     "cSpell.words": [
         "caviarnine",
         "coffieicnet",
+        "defi",
         "humantime",
         "ociswap",
         "OLYPS",

diff --git a/libraries/scrypto-interface/Cargo.toml b/libraries/scrypto-interface/Cargo.toml
@@ -11,6 +11,7 @@ quote = { version = "1.0.35" }
 syn = { version = "2.0.48", features = ["full", "extra-traits"] }
 
 [lib]
+doctest = false
 proc-macro = true
 
 [lints]

diff --git a/packages/defiplaza-v2-adapter-v1/src/blueprint_interface.rs b/packages/defiplaza-v2-adapter-v1/src/blueprint_interface.rs
@@ -2,7 +2,7 @@ use scrypto::prelude::*;
 use scrypto_interface::*;
 
 define_interface! {
-    PlazaDex as DefiPlazaV2Pool impl [
+    PlazaPair as DefiPlazaV2Pool impl [
         ScryptoStub,
         ScryptoTestStub,
         #[cfg(feature = "manifest-builder-stubs")]
@@ -47,7 +47,16 @@ define_interface! {
 }
 
 #[derive(
-    ScryptoSbor, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash,
+    ScryptoSbor,
+    ManifestSbor,
+    Copy,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
 )]
 pub struct PairConfig {
     pub k_in: Decimal,
@@ -57,7 +66,16 @@ pub struct PairConfig {
 }
 
 #[derive(
-    ScryptoSbor, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash,
+    ScryptoSbor,
+    ManifestSbor,
+    Copy,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
 )]
 pub struct TradeAllocation {
     pub base_base: Decimal,
@@ -67,7 +85,16 @@ pub struct TradeAllocation {
 }
 
 #[derive(
-    ScryptoSbor, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash,
+    ScryptoSbor,
+    ManifestSbor,
+    Copy,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
 )]
 pub struct PairState {
     pub p0: Decimal,
@@ -78,7 +105,16 @@ pub struct PairState {
 }
 
 #[derive(
-    ScryptoSbor, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash,
+    ScryptoSbor,
+    ManifestSbor,
+    Copy,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
 )]
 pub enum Shortage {
     BaseShortage,
@@ -87,15 +123,33 @@ pub enum Shortage {
 }
 
 #[derive(
-    ScryptoSbor, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash,
+    ScryptoSbor,
+    ManifestSbor,
+    Copy,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
 )]
 pub enum ShortageState {
     Equilibrium,
     Shortage(Asset),
 }
 
 #[derive(
-    ScryptoSbor, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash,
+    ScryptoSbor,
+    ManifestSbor,
+    Copy,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
 )]
 pub enum Asset {
     Base,

diff --git a/packages/ociswap-v1-adapter-v1/Cargo.toml b/packages/ociswap-v1-adapter-v1/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ociswap-v1-adapter-v1"
 version.workspace = true
 edition.workspace = true
-description = "Defines the adapter for Ociswap"
+description = "Defines the adapter for Ociswap v1 - this is effectively deprecated since we won't be supporting Ociswap v1."
 
 [dependencies]
 sbor = { workspace = true }

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -26,6 +26,10 @@ ociswap-v2-adapter-v1 = { path = "../packages/ociswap-v2-adapter-v1", features =
     "test",
     "manifest-builder-stubs"
 ] }
+defiplaza-v2-adapter-v1 = { path = "../packages/defiplaza-v2-adapter-v1", features = [
+    "test",
+    "manifest-builder-stubs"
+] }
 caviarnine-v1-adapter-v1 = { path = "../packages/caviarnine-v1-adapter-v1", features = [
     "test",
     "manifest-builder-stubs"