Skip to content

Commit 64bad22

Browse files
committed
cargo: test deps bring at workspace level
- test-log used across crates use a single version - vls-core-test not part of workspace so use explicit version and correct test-log version Signed-off-by: Lakshya Singh <[email protected]>
1 parent 1e27e62 commit 64bad22

File tree

8 files changed

+32
-26
lines changed

8 files changed

+32
-26
lines changed

Cargo.toml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,35 @@
33
resolver = "2"
44

55
members = [
6-
"vls-common",
7-
"vls-core",
8-
"vls-frontend",
9-
"vls-cli",
6+
"vls-common",
7+
"vls-core",
8+
"vls-frontend",
9+
"vls-cli",
1010

11-
"bolt-derive",
12-
"policy-derive",
13-
"vls-persist",
14-
"vls-protocol",
15-
"vls-protocol-client",
16-
"vls-protocol-signer",
17-
"vls-proxy",
11+
"bolt-derive",
12+
"policy-derive",
13+
"vls-persist",
14+
"vls-protocol",
15+
"vls-protocol-client",
16+
"vls-protocol-signer",
17+
"vls-proxy",
1818
]
1919

2020
exclude = [
21-
"vls-signer-stm32",
22-
"embedded",
23-
"wasm",
24-
"lightning-storage-server",
25-
"vls-core-test",
21+
"vls-signer-stm32",
22+
"embedded",
23+
"wasm",
24+
"lightning-storage-server",
25+
"vls-core-test",
2626
]
2727

2828
[workspace.dependencies]
2929
tonic = { version = "0.12.0", default-features = false }
3030
tower = { version = "0.4.0" }
3131
prost = { version = "0.13.0" }
3232
env_logger = { version = ">=0.9,<0.12" }
33-
clap = { version = "4.0.0", features = ["derive"]}
33+
clap = { version = "4.0.0", features = ["derive"] }
3434
txoo = { version = "0.10.0", default-features = false }
3535
txoo-bitcoind-client = { version = "0.10.0", default-features = false }
36+
test-log = "0.2.8"
37+
tempfile = "3.10.1"

vls-core-test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ log = "0.4.14"
1515
[dev-dependencies]
1616
vls-core = { path = "../vls-core", features = ["test_utils"] }
1717
vls-persist = { path = "../vls-persist", features = ["redb-kvv"] }
18-
tempfile = "3.2"
18+
tempfile = "3.10.1"
1919

2020
[dev-dependencies.criterion]
2121
version = "0.4.0"

vls-core/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ features = ["dummy-source"]
9595
tokio = { version = "1.0", default-features = false, features = ["macros"] }
9696
paste = "1.0"
9797
# For logging in unit tests
98-
test-log = "0.2.8"
99-
tempfile = "3.10.1"
98+
test-log = { workspace = true }
99+
tempfile = { workspace = true }
100100

101101
[dependencies.lightning]
102102
#git = "https://github.com/lightning-signer/rust-lightning"

vls-frontend/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ workspace = true
3333
features = ["dummy-source"]
3434

3535
[dev-dependencies]
36-
test-log = "0.2.8"
36+
test-log = { workspace = true }
3737
env_logger = { workspace = true }
3838

3939
[[example]]

vls-persist/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ hex = { version = "0.4", default-features = false }
2828
log = { version = "0.4", default-features = false }
2929
serde_json = { version = "1.0", default-features = false, features = ["alloc"], optional = true }
3030
redb = { version = "1.3", optional = true }
31-
tempfile = { version = "3.2", optional = true }
31+
tempfile = { workspace = true, optional = true }
3232
uuid = { version = "1.4", optional = true, features = ["v4"] }
3333
tracing = { version = "0.1.40", features = ["attributes", "log"], default-features = false }
3434

3535
[dev-dependencies]
36-
tempfile = "3.2"
37-
test-log = "0.2"
36+
tempfile = { workspace = true }
37+
test-log = { workspace = true }
3838
env_logger = { workspace = true }
3939
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
4040
ciborium = "0.2"

vls-protocol-signer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ bit-vec = { version = "0.6", default-features = false }
3131
vls-core = { path = "../vls-core", version = "0.13.0", features = ["test_utils"] }
3232
vls-protocol-signer = { path = ".", features = ["developer"] }
3333
# For logging in unit tests
34-
test-log = "0.2"
34+
test-log = { workspace = true }
3535
env_logger = { workspace = true }

vls-protocol/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ workspace = true
2727
regex = "1.5"
2828
# For logging in unit tests
2929
env_logger = { workspace = true }
30-
test-log = "0.2.8"
30+
test-log = { workspace = true }
3131
serde_bolt = { version = "0.5.0", features = ["test_utils"] }
3232
vls-protocol = { path = ".", features = ["developer"] }
3333

vls-proxy/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ workspace = true
8080
[dev-dependencies]
8181
tempfile = "3"
8282
vls-proxy = { path = ".", features = ["developer", "otlp"] }
83+
vls-core = { path = "../vls-core", version = "0.13.0", features = [
84+
"use_backtrace",
85+
"test_utils",
86+
] }
8387

8488
[build-dependencies]
8589
tonic-build = "0.12.0"

0 commit comments

Comments
 (0)