Skip to content

Commit c0f7249

Browse files
committed
Refactor: use shared dependencies across crates
- Solves #99
1 parent 7f306a6 commit c0f7249

File tree

8 files changed

+705
-595
lines changed

8 files changed

+705
-595
lines changed

Cargo.lock

Lines changed: 586 additions & 508 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,39 @@
11
[workspace]
2-
members = ["discovery", "worker", "validator", "shared", "orchestrator", "dev-utils"]
2+
members = [
3+
"discovery",
4+
"worker",
5+
"validator",
6+
"shared",
7+
"orchestrator",
8+
"dev-utils",
9+
]
310
resolver = "2"
411

12+
[workspace.dependencies]
13+
shared = { path = "shared" }
14+
actix-web = "4.9.0"
15+
clap = { version = "4.5.27", features = ["derive"] }
16+
serde = { version = "1.0", features = ["derive"] }
17+
tokio = { version = "1.43.0", features = ["full"] }
18+
uuid = { version = "1.5", features = ["v4", "serde"] }
19+
log = { version = "0.4.26" }
20+
env_logger = { version = "0.11.6" }
21+
futures-util = { version = "0.3.31" }
22+
alloy = { version = "0.9.2", features = ["full"] }
23+
url = "2.5.4"
24+
serde_json = "1.0.137"
25+
reqwest = "0.12.12"
26+
hex = "0.4.3"
27+
anyhow = "1.0.95"
28+
toml = "0.8.20"
29+
tokio-util = "0.7.13"
30+
futures = "0.3.31"
31+
chrono = "0.4.40"
32+
directories = "6.0.0"
33+
nalgebra = "0.33.2"
34+
redis = "0.28.1"
35+
redis-test = "0.8.0"
36+
537
[workspace.package]
638
version = "0.1.7"
739
edition = "2021"

dev-utils/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
shared = { path = "../shared" }
8-
tokio = { version = "1", features = ["full"] }
7+
shared = { workspace = true }
8+
tokio = { workspace = true }
99
eyre = "0.6"
10-
clap = { version = "4.5.26", features = ["derive"] }
11-
url = "2.5.4"
12-
alloy = "0.9.2"
13-
tokio-util = "0.7.13"
10+
clap = { workspace = true }
11+
url = { workspace = true }
12+
alloy = { workspace = true }
13+
tokio-util = { workspace = true }
1414
alloy-node-bindings = "0.9.2"

discovery/Cargo.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ version.workspace = true
44
edition.workspace = true
55

66
[dependencies]
7-
actix-web = "4.9.0"
8-
alloy = "0.9.2"
9-
anyhow = "1.0.95"
10-
clap = { version ="4.5.27", features = ["derive"] }
11-
env_logger = "0.11.6"
12-
log = "0.4.25"
13-
redis = "0.28.1"
14-
redis-test = "0.8.0"
15-
serde = "1.0.217"
16-
serde_json = "1.0.137"
17-
shared = { path = "../shared" }
18-
tokio = "1.43.0"
19-
tokio-util = "0.7.13"
20-
url = "2.5.4"
7+
actix-web = { workspace = true }
8+
alloy = { workspace = true }
9+
anyhow = { workspace = true }
10+
clap = { workspace = true }
11+
env_logger = { workspace = true }
12+
log = { workspace = true }
13+
redis = { workspace = true }
14+
redis-test = { workspace = true }
15+
serde = { workspace = true }
16+
serde_json = { workspace = true }
17+
shared = { workspace = true }
18+
tokio = { workspace = true }
19+
tokio-util = { workspace = true }
20+
url = { workspace = true }

orchestrator/Cargo.toml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ version.workspace = true
44
edition.workspace = true
55

66
[dependencies]
7-
actix-web = "4.9.0"
8-
alloy = "0.9.2"
9-
anyhow = "1.0.95"
7+
actix-web = { workspace = true }
8+
alloy = { workspace = true }
9+
anyhow = { workspace = true }
1010
base64 = "0.22.1"
11-
chrono = "0.4.40"
12-
clap = { version = "4.5.26", features = ["derive"] }
13-
env_logger = "0.11.6"
14-
futures = "0.3.31"
11+
chrono = { workspace = true }
12+
clap = { workspace = true }
13+
env_logger = { workspace = true }
14+
futures = { workspace = true }
1515
google-cloud-auth = "0.18.0"
1616
google-cloud-storage = "0.24.0"
17-
hex = "0.4.3"
18-
log = "0.4.25"
19-
redis = "0.28.1"
20-
redis-test = "0.8.0"
21-
reqwest = "0.12.12"
22-
serde = "1.0.217"
23-
serde_json = "1.0.135"
24-
shared = { path = "../shared" }
25-
tokio = "1.43.0"
26-
url = "2.5.4"
27-
uuid = { version = "1.12.1", features = ["v4", "serde"] }
17+
hex = { workspace = true }
18+
log = { workspace = true }
19+
redis = { workspace = true }
20+
redis-test = { workspace = true }
21+
reqwest = { workspace = true }
22+
serde = { workspace = true }
23+
serde_json = { workspace = true }
24+
shared = { workspace = true }
25+
tokio = { workspace = true }
26+
url = { workspace = true }
27+
uuid = { workspace = true }

shared/Cargo.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ default = []
1212
testnet = []
1313

1414
[dependencies]
15-
tokio = { version = "1.33", features = ["full"] }
16-
alloy = { version = "0.9.2", features = ["full"] }
17-
serde = { version = "1.0", features = ["derive"] }
18-
serde_json = "1.0.135"
19-
url = "2.5.4"
20-
actix-web = "4.9.0"
21-
futures-util = "0.3.31"
22-
hex = "0.4.3"
23-
uuid = { version = "1.12.1", features = ["v4", "serde"] }
24-
redis = "0.28.1"
15+
tokio = { workspace = true }
16+
alloy = { workspace = true }
17+
serde = { workspace = true }
18+
serde_json = { workspace = true }
19+
url = { workspace = true }
20+
actix-web = { workspace = true }
21+
futures-util = { workspace = true }
22+
hex = { workspace = true }
23+
uuid = { workspace = true }
24+
redis = { workspace = true }
2525
dashmap = "6.1.0"
26-
anyhow = "1.0.95"
27-
nalgebra = "0.33.2"
28-
log = "0.4.26"
26+
anyhow = { workspace = true }
27+
nalgebra = { workspace = true }
28+
log = { workspace = true }

validator/Cargo.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ version.workspace = true
44
edition.workspace = true
55

66
[dependencies]
7-
actix-web = "4.9.0"
8-
alloy = { version = "0.9.2", features = ["full"] }
9-
anyhow = "1.0.95"
10-
clap = { version = "4.5.26", features = ["derive"] }
7+
actix-web = { workspace = true }
8+
alloy = { workspace = true }
9+
anyhow = { workspace = true }
10+
clap = { workspace = true }
1111
directories = "6.0.0"
12-
env_logger = "0.11.6"
13-
hex = "0.4.3"
14-
log = "0.4.25"
15-
nalgebra = "0.33.2"
12+
env_logger = { workspace = true }
13+
hex = { workspace = true }
14+
log = { workspace = true }
15+
nalgebra = { workspace = true }
1616
rand = "0.9.0"
17-
reqwest = "0.12.12"
18-
serde = "1.0.217"
19-
serde_json = "1.0.135"
20-
shared = { path = "../shared" }
21-
tokio = "1.43.0"
22-
toml = "0.8.20"
23-
url = "2.5.4"
17+
reqwest = { workspace = true }
18+
serde = { workspace = true }
19+
serde_json = { workspace = true }
20+
shared = { workspace = true }
21+
tokio = { workspace = true }
22+
toml = { workspace = true }
23+
url = { workspace = true }
2424

2525
[dev-dependencies]
2626
tempfile = "=3.14.0"

worker/Cargo.toml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,44 @@ version.workspace = true
44
edition.workspace = true
55

66
[dependencies]
7-
shared = { path = "../shared" }
8-
actix-web = "4.4"
7+
shared = { workspace = true }
8+
actix-web = { workspace = true }
99
bollard = "0.18.1"
10-
clap = { version = "4.4", features = ["derive"] }
10+
clap = { workspace = true }
1111
colored = "2.0"
1212
lazy_static = "1.4"
1313
regex = "1.10"
14-
serde = { version = "1.0", features = ["derive"] }
15-
tokio = { version = "1.33", features = ["full"] }
16-
uuid = { version = "1.5", features = ["v4"] }
14+
serde = { workspace = true }
15+
tokio = { workspace = true }
16+
uuid = { workspace = true }
1717
validator = { version = "0.16", features = ["derive"] }
1818
sysinfo = "0.30"
1919
libc = "0.2"
2020
nvml-wrapper = "0.10.0"
21-
log = "0.4"
22-
env_logger = "0.10.0"
21+
log = { workspace = true }
22+
env_logger = { workspace = true }
2323
cargo-watch = "8.4.1"
2424
futures-core = "0.3"
25-
futures-util = "0.3"
26-
alloy = { version = "0.9.2", features = ["full"] }
27-
url = "2.5.4"
28-
serde_json = "1.0.135"
29-
reqwest = "0.12.12"
30-
hex = "0.4.3"
25+
futures-util = { workspace = true }
26+
alloy = { workspace = true }
27+
url = { workspace = true }
28+
serde_json = { workspace = true }
29+
reqwest = { workspace = true }
30+
hex = { workspace = true }
3131
console = "0.15.10"
3232
indicatif = "0.17.9"
3333
bytes = "1.9.0"
34-
anyhow = "1.0.95"
34+
anyhow = { workspace = true }
3535
thiserror = "2.0.11"
36-
toml = "0.8.19"
36+
toml = { workspace = true }
3737
ctrlc = "3.4.5"
38-
tokio-util = "0.7.13"
39-
futures = "0.3.31"
40-
chrono = "0.4"
38+
tokio-util = { workspace = true }
39+
futures = { workspace = true }
40+
chrono = { workspace = true }
4141
serial_test = "0.5.1"
4242
directories = "6.0.0"
4343
strip-ansi-escapes = "0.2.1"
44-
nalgebra = "0.33.2"
44+
nalgebra = { workspace = true }
4545
sha2 = "0.10.8"
4646

4747
[dev-dependencies]

0 commit comments

Comments
 (0)