Merge pull request #24 from compolabs/spark-repo-file-refactor

♻ ️renamed folders removed old stuff
compolabs · Apr 9, 2024 · 39944c8 · 39944c8
2 parents 72a7f75 + f19c3d2
commit 39944c8
Show file tree

Hide file tree

Showing 52 changed files with 840 additions and 451 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 # TODO: this has to be changed into a workspace
-workspace = { members = [ "spark","spark-market"] }
+workspace = { members = ["spark-cli", "spark-market-sdk", "market-contract"] }
 [package]
-name = "orderbook"
+name = "spark-clob"
 description = "A cargo-generate template for Rust + Sway integration testing."
 version = "0.1.0"
 edition = "2021"
@@ -14,32 +14,7 @@ rand = "0.8.5"
 tokio = { version = "1.12", features = ["rt", "macros"] }
 src20_sdk = { git = "https://github.com/compolabs/src-20.git", branch = "master" }
 dotenv = "0.15.0"
+anyhow = "1.0.81"
 
 [dev-dependencies]
 pretty_assertions = "1"
-
-[[test]]
-harness = true
-name = "integration_tests"
-path = "tests/harness.rs"
-
-
-[[bin]]
-name = "create_market"
-path = "scripts/create_market.rs"
-
-[[bin]]
-name = "create_order"
-path = "scripts/create_order.rs"
-
-[[bin]]
-name = "cancel_order"
-path = "scripts/cancel_order.rs"
-
-[[bin]]
-name = "deploy"
-path = "scripts/deploy.rs"
-
-[[bin]]
-name = "match_orders"
-path = "scripts/match_orders.rs"
diff --git a/src/constants.rs → _src/constants.rs b/src/constants.rs → _src/constants.rs
diff --git a/_src/lib.rs b/_src/lib.rs
@@ -0,0 +1,29 @@
+pub mod constants;
+pub mod orderbook_utils;
+
+pub fn print_title(title: &str) {
+    println!(
+        r#"
+
+ ██████╗ ██████╗ ███╗   ███╗██████╗  ██████╗ ███████╗ █████╗ ██████╗ ██╗██╗     ██╗████████╗██╗   ██╗
+██╔════╝██╔═══██╗████╗ ████║██╔══██╗██╔═══██╗██╔════╝██╔══██╗██╔══██╗██║██║     ██║╚══██╔══╝╚██╗ ██╔╝
+██║     ██║   ██║██╔████╔██║██████╔╝██║   ██║███████╗███████║██████╔╝██║██║     ██║   ██║    ╚████╔╝ 
+██║     ██║   ██║██║╚██╔╝██║██╔═══╝ ██║   ██║╚════██║██╔══██║██╔══██╗██║██║     ██║   ██║     ╚██╔╝  
+╚██████╗╚██████╔╝██║ ╚═╝ ██║██║     ╚██████╔╝███████║██║  ██║██████╔╝██║███████╗██║   ██║      ██║   
+ ╚═════╝ ╚═════╝ ╚═╝     ╚═╝╚═╝      ╚═════╝ ╚══════╝╚═╝  ╚═╝╚═════╝ ╚═╝╚══════╝╚═╝   ╚═╝      ╚═╝   
+                                                                                                     
+██╗      █████╗ ██████╗ ███████╗                                                                     
+██║     ██╔══██╗██╔══██╗██╔════╝                                                                     
+██║     ███████║██████╔╝███████╗                                                                     
+██║     ██╔══██║██╔══██╗╚════██║                                                                     
+███████╗██║  ██║██████╔╝███████║                                                                     
+╚══════╝╚═╝  ╚═╝╚═════╝ ╚══════╝                                                                     
+                                                                                                     
+                                                                    
+Predicate based orderbook
+
+🏁 {title} 🏁 
+
+"#
+    );
+}
diff --git a/src/orderbook_utils.rs → _src/orderbook_utils.rs b/src/orderbook_utils.rs → _src/orderbook_utils.rs
diff --git a/tests/common_test_cases/mod.rs → _tests/common_test_cases/mod.rs b/tests/common_test_cases/mod.rs → _tests/common_test_cases/mod.rs
diff --git a/...est_cases/open_base_token_order_cancel.rs → ...est_cases/open_base_token_order_cancel.rs b/...est_cases/open_base_token_order_cancel.rs → ...est_cases/open_base_token_order_cancel.rs
diff --git a/...te_token_order_cancel_by_reverse_order.rs → ...te_token_order_cancel_by_reverse_order.rs b/...te_token_order_cancel_by_reverse_order.rs → ...te_token_order_cancel_by_reverse_order.rs
diff --git a/tests/harness.rs → _tests/harness.rs b/tests/harness.rs → _tests/harness.rs
diff --git a/tests/match_test/match_orders_cases.rs → _tests/match_test/match_orders_cases.rs b/tests/match_test/match_orders_cases.rs → _tests/match_test/match_orders_cases.rs
@@ -7,7 +7,7 @@ mod success {
 
     // ✅ buyOrder.orderPrice > sellOrder.orderPrice & buyOrder.baseSize > sellOrder.baseSize
     #[tokio::test]
-    async fn match1() {
+    async fn greater_buy_price_and_greater_buy_amount() {
         let buy_price = 46_000_f64;
         let sell_price = 45_000_f64;
         let buy_size = 2_f64;

diff --git a/tests/match_test/match_test.rs → _tests/match_test/match_test.rs b/tests/match_test/match_test.rs → _tests/match_test/match_test.rs
diff --git a/tests/match_test/mod.rs → _tests/match_test/mod.rs b/tests/match_test/mod.rs → _tests/match_test/mod.rs
diff --git a/tests/utils/check_balance.rs → _tests/utils/check_balance.rs b/tests/utils/check_balance.rs → _tests/utils/check_balance.rs
diff --git a/tests/utils/match_orders_case_utils.rs → _tests/utils/match_orders_case_utils.rs b/tests/utils/match_orders_case_utils.rs → _tests/utils/match_orders_case_utils.rs
diff --git a/tests/utils/mint_tokens.rs → _tests/utils/mint_tokens.rs b/tests/utils/mint_tokens.rs → _tests/utils/mint_tokens.rs
diff --git a/tests/utils/mod.rs → _tests/utils/mod.rs b/tests/utils/mod.rs → _tests/utils/mod.rs
diff --git a/tests/utils/setup.rs → _tests/utils/setup.rs b/tests/utils/setup.rs → _tests/utils/setup.rs
diff --git a/market-contract/Cargo.toml b/market-contract/Cargo.toml
@@ -1,5 +1,5 @@
-[project]
-name = "contract"
+[package]
+name = "market-contract"
 version = "0.0.0"
 authors = ["Compo Labs"]
 edition = "2021"

diff --git a/market-contract/tests/functions/core/cancel_order.rs b/market-contract/tests/functions/core/cancel_order.rs
@@ -2,7 +2,7 @@ use crate::utils::{
     interface::core::{cancel_order, deposit, open_order},
     setup::{setup, Defaults, OrderType},
 };
-
+ 
 mod success {
 
     use super::*;

diff --git a/market-contract/tests/utils/setup.rs b/market-contract/tests/utils/setup.rs
@@ -7,14 +7,15 @@ use fuels::{
     types::Identity,
 };
 
+// PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("market-contract/out/debug/market-contract.bin");
+const MARKET_CONTRACT_BINARY_PATH: &str = "../market-contract/out/debug/market-contract.bin";
+const MARKET_CONTRACT_STORAGE_PATH: &str =
+    "../market-contract/out/debug/market-contract-storage_slots.json";
 abigen!(Contract(
     name = "Market",
-    abi = "./out/debug/market-contract-abi.json"
+    abi = "./market-contract/out/debug/market-contract-abi.json"
 ));
 
-const MARKET_CONTRACT_BINARY_PATH: &str = "./out/debug/market-contract.bin";
-const MARKET_CONTRACT_STORAGE_PATH: &str = "./out/debug/market-contract-storage_slots.json";
-
 pub(crate) struct Assets {
     pub(crate) base: Asset,
     pub(crate) quote: Asset,

diff --git a/scripts/cancel_order.rs b/scripts/cancel_order.rs
diff --git a/scripts/create_market.rs b/scripts/create_market.rs
diff --git a/scripts/create_order.rs b/scripts/create_order.rs
diff --git a/scripts/deploy.rs b/scripts/deploy.rs
diff --git a/scripts/match_orders.rs b/scripts/match_orders.rs
diff --git a/spark/Cargo.lock → spark-cli/Cargo.lock b/spark/Cargo.lock → spark-cli/Cargo.lock
diff --git a/spark/Cargo.toml → spark-cli/Cargo.toml b/spark/Cargo.toml → spark-cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "spark"
+name = "spark-cli"
 version = "0.1.0"
 edition = "2021"
 
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0.81"
 clap = { version = "4.5.4", features = ["derive"] }
-spark-market = { path = "../spark-market" }
+spark-market-sdk = { path = "../spark-market-sdk" }
 fuels = { version = "0.55.0", features = ["fuel-core-lib"] }
 dotenv = "0.15.0"
 tokio = { version = "1.12", features = ["rt", "macros"] }
diff --git a/spark/README.md → spark-cli/README.md b/spark/README.md → spark-cli/README.md
diff --git a/spark/src/commands/cli.rs → spark-cli/src/commands/cli.rs b/spark/src/commands/cli.rs → spark-cli/src/commands/cli.rs
diff --git a/spark/src/commands/core/batch_fulfill.rs → spark-cli/src/commands/core/batch_fulfill.rs b/spark/src/commands/core/batch_fulfill.rs → spark-cli/src/commands/core/batch_fulfill.rs
diff --git a/spark/src/commands/core/cli.rs → spark-cli/src/commands/core/cli.rs b/spark/src/commands/core/cli.rs → spark-cli/src/commands/core/cli.rs
diff --git a/spark/src/commands/core/close_order.rs → spark-cli/src/commands/core/close_order.rs b/spark/src/commands/core/close_order.rs → spark-cli/src/commands/core/close_order.rs