project: use a workspace architecture

pythcoiner · Feb 23, 2025 · ce451ef · ce451ef
1 parent d0c376c
commit ce451ef
Show file tree

Hide file tree

Showing 27 changed files with 41 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
-/target/
-Cargo.lock
+/target/*
+/rust/joinstr/Cargo.lock
 /dart/ios/
 /dart/android/
+Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,33 +1,6 @@
-[package]
-name = "joinstr"
-version = "0.0.1"
-edition = "2021"
-
-[lib]
-crate-type = ["rlib", "cdylib", "staticlib"]
-
-[features]
-default = []
-async = ["nostr-sdk", "tokio"]
-
-[dependencies]
-home = "=0.5.9"
-bitcoin = "=0.32.2"
-bip39 = { version = "2.0.0", features = ["rand"] }
-hex-conservative = "0.2.1"
-miniscript = {version = "12.2.0", features = ["base64", "serde"]}
-simple_electrum_client = { git = "https://github.com/pythcoiner/simple_electrum_client.git", branch = "openssl_vendored"}
-nostr-sdk = {version = "0.35.0", optional = true}
-serde = { version = "1.0.210", features = ["derive"] }
-serde_json = "1.0.128"
-tokio = {version = "1.40.0", optional = true }
-log = "0.4.22"
-env_logger = "=0.10.2"
-rand = "0.8.5"
-simple_nostr_client = { git = "https://github.com/pythcoiner/simple_nostr_client.git", branch = "master" }
-native-tls = "=0.2.13"
-
-[dev-dependencies]
-electrsd = { git = "https://github.com/pythcoiner/electrsd.git", branch = "buffered_logs"}
-nostrd = { git = "https://github.com/pythcoiner/nostrd.git", branch = "master" }
+[workspace]
+resolver = "2"
 
+members = [
+    "rust/joinstr",
+]
diff --git a/rust/joinstr/Cargo.toml b/rust/joinstr/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+name = "joinstr"
+version = "0.0.1"
+edition = "2021"
+
+[lib]
+crate-type = ["rlib", "cdylib", "staticlib"]
+
+[features]
+default = []
+async = ["nostr-sdk", "tokio"]
+
+[dependencies]
+home = "=0.5.9"
+bitcoin = "=0.32.2"
+bip39 = { version = "2.0.0", features = ["rand"] }
+hex-conservative = "0.2.1"
+miniscript = {version = "12.2.0", features = ["base64", "serde"]}
+simple_electrum_client = { git = "https://github.com/pythcoiner/simple_electrum_client.git", branch = "openssl_vendored"}
+nostr-sdk = {version = "0.35.0", optional = true}
+serde = { version = "1.0.210", features = ["derive"] }
+serde_json = "1.0.128"
+tokio = {version = "1.40.0", optional = true }
+log = "0.4.22"
+env_logger = "=0.10.2"
+rand = "0.8.5"
+simple_nostr_client = { git = "https://github.com/pythcoiner/simple_nostr_client.git", branch = "master" }
+native-tls = "=0.2.13"
+
+[dev-dependencies]
+electrsd = { git = "https://github.com/pythcoiner/electrsd.git", branch = "buffered_logs"}
+nostrd = { git = "https://github.com/pythcoiner/nostrd.git", branch = "master" }
+
diff --git a/README.md → rust/joinstr/README.md b/README.md → rust/joinstr/README.md
diff --git a/include/cpp/joinstr.cpp → rust/joinstr/include/cpp/joinstr.cpp b/include/cpp/joinstr.cpp → rust/joinstr/include/cpp/joinstr.cpp
diff --git a/include/cpp/joinstr.h → rust/joinstr/include/cpp/joinstr.h b/include/cpp/joinstr.h → rust/joinstr/include/cpp/joinstr.h
diff --git a/src/coinjoin/error.rs → rust/joinstr/src/coinjoin/error.rs b/src/coinjoin/error.rs → rust/joinstr/src/coinjoin/error.rs
diff --git a/src/coinjoin/mod.rs → rust/joinstr/src/coinjoin/mod.rs b/src/coinjoin/mod.rs → rust/joinstr/src/coinjoin/mod.rs
diff --git a/src/electrum.rs → rust/joinstr/src/electrum.rs b/src/electrum.rs → rust/joinstr/src/electrum.rs
diff --git a/src/interface.rs → rust/joinstr/src/interface.rs b/src/interface.rs → rust/joinstr/src/interface.rs
diff --git a/src/joinstr/error.rs → rust/joinstr/src/joinstr/error.rs b/src/joinstr/error.rs → rust/joinstr/src/joinstr/error.rs
diff --git a/src/joinstr/mod.rs → rust/joinstr/src/joinstr/mod.rs b/src/joinstr/mod.rs → rust/joinstr/src/joinstr/mod.rs
diff --git a/src/lib.rs → rust/joinstr/src/lib.rs b/src/lib.rs → rust/joinstr/src/lib.rs
diff --git a/src/nostr/async/mod.rs → rust/joinstr/src/nostr/async/mod.rs b/src/nostr/async/mod.rs → rust/joinstr/src/nostr/async/mod.rs
diff --git a/src/nostr/error.rs → rust/joinstr/src/nostr/error.rs b/src/nostr/error.rs → rust/joinstr/src/nostr/error.rs
diff --git a/src/nostr/mod.rs → rust/joinstr/src/nostr/mod.rs b/src/nostr/mod.rs → rust/joinstr/src/nostr/mod.rs
diff --git a/src/nostr/sync/mod.rs → rust/joinstr/src/nostr/sync/mod.rs b/src/nostr/sync/mod.rs → rust/joinstr/src/nostr/sync/mod.rs
diff --git a/src/signer/error.rs → rust/joinstr/src/signer/error.rs b/src/signer/error.rs → rust/joinstr/src/signer/error.rs
diff --git a/src/signer/mod.rs → rust/joinstr/src/signer/mod.rs b/src/signer/mod.rs → rust/joinstr/src/signer/mod.rs
diff --git a/src/utils.rs → rust/joinstr/src/utils.rs b/src/utils.rs → rust/joinstr/src/utils.rs
diff --git a/tests/bin/bitcoind_25_2 → rust/joinstr/tests/bin/bitcoind_25_2 b/tests/bin/bitcoind_25_2 → rust/joinstr/tests/bin/bitcoind_25_2
diff --git a/tests/bin/electrs_0_9_11 → rust/joinstr/tests/bin/electrs_0_9_11 b/tests/bin/electrs_0_9_11 → rust/joinstr/tests/bin/electrs_0_9_11
diff --git a/tests/bin/esplora → rust/joinstr/tests/bin/esplora b/tests/bin/esplora → rust/joinstr/tests/bin/esplora
diff --git a/tests/bin/mempool_3_0_0 → rust/joinstr/tests/bin/mempool_3_0_0 b/tests/bin/mempool_3_0_0 → rust/joinstr/tests/bin/mempool_3_0_0
diff --git a/tests/coinjoin.rs → rust/joinstr/tests/coinjoin.rs b/tests/coinjoin.rs → rust/joinstr/tests/coinjoin.rs
diff --git a/tests/joinstr.rs → rust/joinstr/tests/joinstr.rs b/tests/joinstr.rs → rust/joinstr/tests/joinstr.rs
diff --git a/tests/utils.rs → rust/joinstr/tests/utils.rs b/tests/utils.rs → rust/joinstr/tests/utils.rs