Skip to content

Commit 54d7657

Browse files
committed
promote bitcoind-tests and fuzz to workspaces
This lets you run all the tests with `cargo test --all`. It also causes all crates to share a lockfile, for better or worse. We cannot also bring 'embedded' as a workspace because it doesn't actually build on desktop CPUs.
1 parent 4a3ba11 commit 54d7657

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,7 @@ required-features = ["compiler","std"]
6666
[[example]]
6767
name = "psbt_sign_finalize"
6868
required-features = ["std", "base64"]
69+
70+
[workspace]
71+
members = ["bitcoind-tests", "fuzz"]
72+
exclude = ["embedded"]

bitcoind-tests/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ name = "bitcoind-tests"
33
version = "0.1.0"
44
authors = ["sanket1729 <[email protected]>"]
55
edition = "2018"
6+
publish = false
67

78
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
89

910
[dependencies]
1011
miniscript = {path = "../"}
1112
bitcoind = { version = "0.29.3" }
1213
actual-rand = { package = "rand", version = "0.8.4"}
13-
secp256k1 = {version = "0.27.0", features = ["rand-std"]}
14+
secp256k1 = {version = "0.27.0", features = ["rand-std"]}

embedded/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ edition = "2018"
77
readme = "README.md"
88
name = "embedded"
99
version = "0.1.0"
10+
publish = false
1011

1112
[dependencies]
1213
cortex-m = "0.6.0"
@@ -25,4 +26,4 @@ bench = false
2526
codegen-units = 1 # better optimizations
2627
debug = true # symbols are nice and they don't increase the size on Flash
2728
lto = true # better optimizations
28-
opt-level = "z"
29+
opt-level = "z"

fuzz/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ afl = { version = "0.8", optional = true }
1717
regex = { version = "1.4"}
1818
miniscript = { path = "..", features = ["compiler"] }
1919

20-
# Prevent this from interfering with workspaces
21-
[workspace]
22-
members = ["."]
23-
2420
[[bin]]
2521
name = "roundtrip_descriptor"
2622
path = "fuzz_targets/roundtrip_descriptor.rs"

0 commit comments

Comments
 (0)