Reorganize crates

radixdlt · Jan 3, 2024 · f759ef7 · f759ef7
1 parent 8f7b240
commit f759ef7
Show file tree

Hide file tree

Showing 19 changed files with 18 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,17 +1,16 @@
 [workspace]
 resolver = "2"
 members = [
-    # Protocol Core
-    "olympus",
-    # Core Libraries
-    "scrypto-interface",
-    "scrypto-interface-proc-macros",
-    # Interfaces
-    "adapters-interface",
-    "ociswap-adapter",
+    # Blueprints
+    "blueprints/olympus",
+    "blueprints/test-oracle",
+    "blueprints/ociswap-adapter",
+    # Libraries
+    "libraries/scrypto-interface",
+    "libraries/scrypto-interface-proc-macros",
+    "libraries/adapters-interface",
     # Testing
     "unit-tests",
-    "test-oracle",
 ]
 
 [workspace.package]

diff --git a/ociswap-adapter/Cargo.toml → blueprints/ociswap-adapter/Cargo.toml b/ociswap-adapter/Cargo.toml → blueprints/ociswap-adapter/Cargo.toml
@@ -9,8 +9,8 @@ sbor = { workspace = true }
 scrypto = { workspace = true }
 radix-engine-interface = { workspace = true }
 
-scrypto-interface = { path = "../scrypto-interface" }
-adapters-interface = { path = "../adapters-interface" }
+scrypto-interface = { path = "../../libraries/scrypto-interface" }
+adapters-interface = { path = "../../libraries/adapters-interface" }
 
 [features]
 default = []

diff --git a/ociswap-adapter/src/lib.rs → blueprints/ociswap-adapter/src/lib.rs b/ociswap-adapter/src/lib.rs → blueprints/ociswap-adapter/src/lib.rs
diff --git a/olympus/Cargo.toml → blueprints/olympus/Cargo.toml b/olympus/Cargo.toml → blueprints/olympus/Cargo.toml
@@ -9,7 +9,7 @@ sbor = { workspace = true }
 scrypto = { workspace = true }
 radix-engine-derive = { workspace = true }
 
-adapters-interface = { path = "../adapters-interface" }
+adapters-interface = { path = "../../libraries/adapters-interface" }
 
 humantime = { version = "2.1.0" }
 

diff --git a/olympus/src/lib.rs → blueprints/olympus/src/lib.rs b/olympus/src/lib.rs → blueprints/olympus/src/lib.rs
diff --git a/olympus/src/types/liquidity_position.rs → ...s/olympus/src/types/liquidity_position.rs b/olympus/src/types/liquidity_position.rs → ...s/olympus/src/types/liquidity_position.rs
diff --git a/olympus/src/types/mod.rs → blueprints/olympus/src/types/mod.rs b/olympus/src/types/mod.rs → blueprints/olympus/src/types/mod.rs
diff --git a/olympus/src/types/percent.rs → blueprints/olympus/src/types/percent.rs b/olympus/src/types/percent.rs → blueprints/olympus/src/types/percent.rs
diff --git a/test-oracle/Cargo.toml → blueprints/test-oracle/Cargo.toml b/test-oracle/Cargo.toml → blueprints/test-oracle/Cargo.toml
@@ -9,8 +9,8 @@ sbor = { workspace = true }
 scrypto = { workspace = true }
 radix-engine-derive = { workspace = true }
 
-scrypto-interface = { path = "../scrypto-interface" }
-adapters-interface = { path = "../adapters-interface" }
+scrypto-interface = { path = "../../libraries/scrypto-interface" }
+adapters-interface = { path = "../../libraries/adapters-interface" }
 
 humantime = { version = "2.1.0" }
 

diff --git a/test-oracle/src/lib.rs → blueprints/test-oracle/src/lib.rs b/test-oracle/src/lib.rs → blueprints/test-oracle/src/lib.rs
diff --git a/adapters-interface/Cargo.toml → libraries/adapters-interface/Cargo.toml b/adapters-interface/Cargo.toml → libraries/adapters-interface/Cargo.toml
diff --git a/adapters-interface/src/lib.rs → libraries/adapters-interface/src/lib.rs b/adapters-interface/src/lib.rs → libraries/adapters-interface/src/lib.rs
diff --git a/adapters-interface/src/oracle.rs → libraries/adapters-interface/src/oracle.rs b/adapters-interface/src/oracle.rs → libraries/adapters-interface/src/oracle.rs
diff --git a/adapters-interface/src/pool.rs → libraries/adapters-interface/src/pool.rs b/adapters-interface/src/pool.rs → libraries/adapters-interface/src/pool.rs
diff --git a/scrypto-interface-proc-macros/Cargo.toml → .../scrypto-interface-proc-macros/Cargo.toml b/scrypto-interface-proc-macros/Cargo.toml → .../scrypto-interface-proc-macros/Cargo.toml
diff --git a/scrypto-interface-proc-macros/src/lib.rs → .../scrypto-interface-proc-macros/src/lib.rs b/scrypto-interface-proc-macros/src/lib.rs → .../scrypto-interface-proc-macros/src/lib.rs
diff --git a/scrypto-interface/Cargo.toml → libraries/scrypto-interface/Cargo.toml b/scrypto-interface/Cargo.toml → libraries/scrypto-interface/Cargo.toml
@@ -5,5 +5,5 @@ edition.workspace = true
 description = "A library that provides compile-time interface capabilities to Scrypto blueprints"
 
 [dependencies]
-paste = "1.0.14"
+paste = { version = "1.0.14" }
 scrypto-interface-proc-macros = { path = "../scrypto-interface-proc-macros" }
diff --git a/scrypto-interface/src/lib.rs → libraries/scrypto-interface/src/lib.rs b/scrypto-interface/src/lib.rs → libraries/scrypto-interface/src/lib.rs
diff --git a/unit-tests/Cargo.toml b/unit-tests/Cargo.toml
@@ -17,10 +17,10 @@ radix-engine-interface = { workspace = true }
 radix-engine-store-interface = { workspace = true }
 
 # Pull in the various blueprints to get their testing stubs
-olympus = { path = "../olympus", features = ["test"] }
-test-oracle = { path = "../test-oracle", features = ["test"] }
-ociswap-adapter = { path = "../ociswap-adapter", features = ["test"] }
-adapters-interface = { path = "../adapters-interface" }
+olympus = { path = "../blueprints/olympus", features = ["test"] }
+test-oracle = { path = "../blueprints/test-oracle", features = ["test"] }
+ociswap-adapter = { path = "../blueprints/ociswap-adapter", features = ["test"] }
+adapters-interface = { path = "../libraries/adapters-interface" }
 
 paste = { version = "1.0.14" }
 lazy_static = { version = "1.4.0" }