[Misc]: Add version of DEX package to name

radixdlt · Feb 9, 2024 · b055bc4 · b055bc4
1 parent ff1480c
commit b055bc4
Show file tree

Hide file tree

Showing 20 changed files with 335 additions and 318 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,8 +4,8 @@ members = [
     # Packages
     "packages/ignition",
     "packages/simple-oracle",
-    "packages/ociswap-adapter-v1",
-    "packages/caviarnine-adapter-v1",
+    "packages/ociswap-v1-adapter-v1",
+    "packages/caviarnine-v1-adapter-v1",
     # Libraries
     "libraries/package-loader",
     "libraries/gateway-client",

diff --git a/packages/caviarnine-adapter-v1/Cargo.toml → packages/caviarnine-v1-adapter-v1/Cargo.toml b/packages/caviarnine-adapter-v1/Cargo.toml → packages/caviarnine-v1-adapter-v1/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "caviarnine-adapter-v1"
+name = "caviarnine-v1-adapter-v1"
 version.workspace = true
 edition.workspace = true
 description = "Defines the adapter for Caviarnine"

diff --git a/packages/caviarnine-adapter-v1/README.md → packages/caviarnine-v1-adapter-v1/README.md b/packages/caviarnine-adapter-v1/README.md → packages/caviarnine-v1-adapter-v1/README.md
diff --git a/...caviarnine-adapter-v1/src/bin_selector.rs → ...iarnine-v1-adapter-v1/src/bin_selector.rs b/...caviarnine-adapter-v1/src/bin_selector.rs → ...iarnine-v1-adapter-v1/src/bin_selector.rs
diff --git a/...ine-adapter-v1/src/blueprint_interface.rs → ...-v1-adapter-v1/src/blueprint_interface.rs b/...ine-adapter-v1/src/blueprint_interface.rs → ...-v1-adapter-v1/src/blueprint_interface.rs
@@ -2,7 +2,7 @@ use scrypto::prelude::*;
 use scrypto_interface::*;
 
 define_interface! {
-    QuantaSwap as CaviarninePool impl [
+    QuantaSwap as CaviarnineV1Pool impl [
         ScryptoStub,
         ScryptoTestStub,
         #[cfg(feature = "manifest-builder-stubs")]

diff --git a/packages/caviarnine-adapter-v1/src/lib.rs → packages/caviarnine-v1-adapter-v1/src/lib.rs b/packages/caviarnine-adapter-v1/src/lib.rs → packages/caviarnine-v1-adapter-v1/src/lib.rs
@@ -23,7 +23,7 @@ macro_rules! define_error {
         )*
     ) => {
         $(
-            const $name: &'static str = concat!("[Caviarnine Adapter]", " ", $item);
+            const $name: &'static str = concat!("[Caviarnine v1 Adapter v1]", " ", $item);
         )*
     };
 }
@@ -104,8 +104,8 @@ pub mod adapter {
 
         fn pool(
             component_address: ComponentAddress,
-        ) -> CaviarninePoolInterfaceScryptoStub {
-            CaviarninePoolInterfaceScryptoStub::from(component_address)
+        ) -> CaviarnineV1PoolInterfaceScryptoStub {
+            CaviarnineV1PoolInterfaceScryptoStub::from(component_address)
         }
 
         fn get_pool_information(

diff --git a/...es/caviarnine-adapter-v1/src/tick_math.rs → ...caviarnine-v1-adapter-v1/src/tick_math.rs b/...es/caviarnine-adapter-v1/src/tick_math.rs → ...caviarnine-v1-adapter-v1/src/tick_math.rs
diff --git a/packages/ociswap-adapter-v1/Cargo.toml → packages/ociswap-v1-adapter-v1/Cargo.toml b/packages/ociswap-adapter-v1/Cargo.toml → packages/ociswap-v1-adapter-v1/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ociswap-adapter-v1"
+name = "ociswap-v1-adapter-v1"
 version.workspace = true
 edition.workspace = true
 description = "Defines the adapter for Ociswap"

diff --git a/...wap-adapter-v1/src/blueprint_interface.rs → ...-v1-adapter-v1/src/blueprint_interface.rs b/...wap-adapter-v1/src/blueprint_interface.rs → ...-v1-adapter-v1/src/blueprint_interface.rs
@@ -2,7 +2,7 @@ use scrypto::prelude::*;
 use scrypto_interface::*;
 
 define_interface! {
-    BasicPool as OciswapPool impl [
+    BasicPool as OciswapV1Pool impl [
         ScryptoStub,
         ScryptoTestStub,
         #[cfg(feature = "manifest-builder-stubs")]

diff --git a/packages/ociswap-adapter-v1/src/lib.rs → packages/ociswap-v1-adapter-v1/src/lib.rs b/packages/ociswap-adapter-v1/src/lib.rs → packages/ociswap-v1-adapter-v1/src/lib.rs
@@ -16,7 +16,7 @@ macro_rules! define_error {
         )*
     ) => {
         $(
-            pub const $name: &'static str = concat!("[Ociswap Adapter]", " ", $item);
+            pub const $name: &'static str = concat!("[Ociswap v1 Adapter v1]", " ", $item);
         )*
     };
 }
@@ -64,8 +64,8 @@ pub mod adapter {
 
         fn pool(
             component_address: ComponentAddress,
-        ) -> OciswapPoolInterfaceScryptoStub {
-            OciswapPoolInterfaceScryptoStub::from(component_address)
+        ) -> OciswapV1PoolInterfaceScryptoStub {
+            OciswapV1PoolInterfaceScryptoStub::from(component_address)
         }
     }
 

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -15,11 +15,11 @@ radix-engine-interface = { workspace = true }
 
 ignition = { path = "../packages/ignition", features = ["test"] }
 simple-oracle = { path = "../packages/simple-oracle", features = ["test"] }
-ociswap-adapter-v1 = { path = "../packages/ociswap-adapter-v1", features = [
+ociswap-v1-adapter-v1 = { path = "../packages/ociswap-v1-adapter-v1", features = [
     "test",
     "manifest-builder-stubs"
 ] }
-caviarnine-adapter-v1 = { path = "../packages/caviarnine-adapter-v1", features = [
+caviarnine-v1-adapter-v1 = { path = "../packages/caviarnine-v1-adapter-v1", features = [
     "test",
     "manifest-builder-stubs"
 ] }