Skip to content

Commit 08454de

Browse files
dannywillemsdannywillems
committed
Cargo: move all packages in workspace
1 parent c45bdca commit 08454de

File tree

15 files changed

+118
-143
lines changed

15 files changed

+118
-143
lines changed

‎Cargo.toml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,16 @@ linkme = "0.3.22"
139139
local-ip-address = "0.6.1"
140140
log = "0.4.25"
141141
md5 = "0.7.0"
142+
mina-core = { path = "core" }
142143
mina-curves = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
144+
mina-fuzzer = { path = "fuzzer" }
143145
mina-hasher = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
146+
mina-macros = { path = "macros" }
144147
mina-node-account = { path = "node/account" }
148+
mina-node-common = { path = "node/common" }
149+
mina-node-invariants = { path = "node/invariants" }
150+
mina-node-native = { path = "node/native" }
151+
mina-node-testing = { path = "node/testing" }
145152
mina-p2p-messages = { path = "mina-p2p-messages" }
146153
mina-poseidon = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
147154
mina-producer-dashboard = { path = "producer-dashboard" }
@@ -150,6 +157,7 @@ mio = { version = "1.0.4", features = ["os-poll", "net"] }
150157
multiaddr = "0.18.1"
151158
multihash = { version = "0.18.1", features = ["blake2b"] }
152159
nix = { version = "0.27.1", features = ["process", "signal"] }
160+
node = { path = "node" }
153161
nom = "8.0.0"
154162
num = { version = "0.4", features = ["std"] }
155163
num-bigint = { git = "https://github.com/openmina/num-bigint", branch = "rebase-onstack" }
@@ -189,6 +197,7 @@ rsexp = "0.2.3"
189197
rsexp-derive = "0.2.3"
190198
rsprocmaps = "0.3.2"
191199
rust-format = "0.3"
200+
salsa-simple = { path = "tools/salsa-simple" }
192201
salsa20 = "0.10.2"
193202
serde = { version = "1.0.190", features = ["derive", "rc"] }
194203
serde_bytes = "0.11"

‎cli/Cargo.toml‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,35 @@ name = "mina"
99
path = "src/main.rs"
1010

1111
[dependencies]
12-
hex = { workspace = true }
13-
ledger = { workspace = true }
14-
libp2p-identity = { workspace = true, features = ["peerid"] }
15-
mina-p2p-messages = { workspace = true }
16-
num_cpus = { workspace = true }
17-
rand = { workspace = true }
18-
rayon = { workspace = true }
19-
redux = { workspace = true }
20-
serde = { workspace = true }
21-
sha2 = { workspace = true }
22-
tokio = { workspace = true }
23-
vrf = { workspace = true }
24-
2512
anyhow = { workspace = true }
26-
clap = { workspace = true, features = ["derive", "env"] }
27-
console = { workspace = true }
28-
reqwest = { workspace = true, features = ["blocking", "json"] }
29-
time = { workspace = true }
30-
3113
backtrace = { workspace = true }
3214
bytes = { workspace = true }
15+
clap = { workspace = true, features = ["derive", "env"] }
16+
console = { workspace = true }
3317
dialoguer = { workspace = true }
18+
hex = { workspace = true }
19+
ledger = { workspace = true }
20+
libp2p-identity = { workspace = true, features = ["peerid"] }
3421
mina-core = { path = "../core" }
3522
mina-node-account = { workspace = true }
3623
mina-node-native = { path = "../node/native" }
24+
mina-p2p-messages = { workspace = true }
3725
mina-signer = { workspace = true }
3826
nix = { workspace = true, features = ["signal"] }
3927
node = { path = "../node", features = ["replay"] }
28+
num_cpus = { workspace = true }
29+
rand = { workspace = true }
30+
rayon = { workspace = true }
31+
redux = { workspace = true }
32+
reqwest = { workspace = true, features = ["blocking", "json"] }
33+
serde = { workspace = true }
4034
serde_json = { workspace = true }
35+
sha2 = { workspace = true }
4136
shellexpand = { workspace = true }
37+
time = { workspace = true }
38+
tokio = { workspace = true }
4239
tracing = { workspace = true }
40+
vrf = { workspace = true }
4341

4442
[target.'cfg(not(target_family = "wasm"))'.dependencies]
4543
redux = { workspace = true, features = ["serializable_callbacks"] }

‎core/Cargo.toml‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,27 @@ license = "Apache-2.0"
66

77
[dependencies]
88
argon2 = { workspace = true }
9+
ark-ff = { workspace = true }
910
base64 = { workspace = true }
1011
binprot = { workspace = true }
1112
binprot_derive = { workspace = true }
1213
bs58 = { workspace = true }
1314
crypto_secretbox = { workspace = true }
1415
flume = { workspace = true }
16+
graphannis-malloc_size_of = { workspace = true }
17+
graphannis-malloc_size_of_derive = { workspace = true }
18+
hex = { workspace = true }
1519
lazy_static = { workspace = true }
20+
libp2p-identity = { workspace = true, features = ["serde", "peerid"] }
1621
md5 = { workspace = true }
17-
mina-fuzzer = { path = "../fuzzer", optional = true }
18-
mina-macros = { path = "../macros" }
22+
mina-curves = { workspace = true }
23+
mina-fuzzer = { workspace = true, optional = true }
24+
mina-hasher = { workspace = true }
25+
mina-macros = { workspace = true }
26+
mina-p2p-messages = { workspace = true }
1927
multihash = { workspace = true }
2028
once_cell = { workspace = true }
29+
poseidon = { workspace = true }
2130
rand = { workspace = true }
2231
redux = { workspace = true }
2332
serde = { workspace = true, features = ["rc"] }
@@ -29,17 +38,6 @@ time = { workspace = true }
2938
tokio = { workspace = true, features = ["sync"] }
3039
tracing = { workspace = true }
3140

32-
graphannis-malloc_size_of = { workspace = true }
33-
graphannis-malloc_size_of_derive = { workspace = true }
34-
35-
ark-ff = { workspace = true }
36-
hex = { workspace = true }
37-
libp2p-identity = { workspace = true, features = ["serde", "peerid"] }
38-
mina-curves = { workspace = true }
39-
mina-hasher = { workspace = true }
40-
mina-p2p-messages = { workspace = true }
41-
poseidon = { workspace = true }
42-
4341
[target.'cfg(not(target_family = "wasm"))'.dependencies]
4442
redux = { workspace = true, features = ["serializable_callbacks"] }
4543

‎ledger/Cargo.toml‎

Lines changed: 29 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -17,62 +17,49 @@ crate-type = ["staticlib", "cdylib", "lib"]
1717
# https://stackoverflow.com/a/73023306
1818

1919
[dependencies]
20+
anyhow = { workspace = true }
21+
ark-ec = { workspace = true }
22+
ark-ff = { workspace = true }
23+
ark-poly = { workspace = true }
24+
ark-serialize = { workspace = true }
25+
backtrace = { workspace = true }
26+
base64 = { workspace = true }
27+
bitvec = { workspace = true }
28+
blake2 = { workspace = true }
29+
bs58 = { workspace = true }
30+
crc32fast = { workspace = true }
31+
derive_more = { workspace = true }
32+
fraction = { workspace = true }
33+
hex = { workspace = true }
34+
itertools = { workspace = true }
2035
juniper = { workspace = true }
2136
kimchi = { workspace = true }
22-
mina-core = { path = "../core" }
37+
lazy_static = { workspace = true }
38+
libc = { workspace = true }
39+
mina-core = { workspace = true }
2340
mina-curves = { workspace = true }
2441
mina-hasher = { workspace = true }
25-
mina-macros = { path = "../macros" }
42+
mina-macros = { workspace = true }
43+
mina-p2p-messages = { workspace = true }
2644
mina-poseidon = { workspace = true }
2745
mina-signer = { workspace = true }
46+
num-bigint = { workspace = true }
2847
o1-utils = { workspace = true }
48+
once_cell = { workspace = true }
2949
poly-commitment = { workspace = true }
3050
poseidon = { workspace = true }
31-
redux = { workspace = true }
32-
strum = { workspace = true }
33-
strum_macros = { workspace = true }
34-
35-
bs58 = { workspace = true }
36-
mina-p2p-messages = { workspace = true }
37-
38-
base64 = { workspace = true }
39-
lazy_static = { workspace = true }
40-
libc = { workspace = true }
41-
sha2 = { workspace = true }
42-
43-
# oracle = { path = "../oracle" }
44-
# mina-curves = { path = "../curves" }
45-
# o1-utils = { path = "../utils" }
46-
47-
itertools = { workspace = true }
48-
49-
ark-ec = { workspace = true }
50-
ark-ff = { workspace = true }
51-
ark-poly = { workspace = true }
52-
ark-serialize = { workspace = true }
53-
54-
rayon = { workspace = true }
55-
56-
bitvec = { workspace = true }
57-
hex = { workspace = true }
58-
num-bigint = { workspace = true }
59-
60-
once_cell = { workspace = true }
61-
rand = { workspace = true, features = ["small_rng"] }
62-
uuid = { workspace = true }
63-
6451
postcard = { workspace = true }
52+
rand = { workspace = true, features = ["small_rng"] }
53+
rayon = { workspace = true }
54+
redux = { workspace = true }
6555
serde = { workspace = true, features = ["rc"] }
6656
serde_json = { workspace = true, features = ["float_roundtrip"] }
67-
68-
anyhow = { workspace = true }
69-
backtrace = { workspace = true }
70-
blake2 = { workspace = true }
71-
crc32fast = { workspace = true }
72-
derive_more = { workspace = true }
73-
fraction = { workspace = true }
7457
serde_with = { workspace = true }
58+
sha2 = { workspace = true }
59+
strum = { workspace = true }
60+
strum_macros = { workspace = true }
7561
thiserror = { workspace = true }
62+
uuid = { workspace = true }
7663

7764
[target.'cfg(target_family = "wasm")'.dependencies]
7865
getrandom = { workspace = true, features = ["js"] }
@@ -81,9 +68,7 @@ wasm-bindgen-futures = { workspace = true }
8168

8269
[target.'cfg(not(target_family = "wasm"))'.dependencies]
8370
zstd = { workspace = true, optional = true }
84-
# ocaml-interop = { path = "/home/sebastien/github/ocaml-interop", optional = true }
8571
ocaml-interop = { workspace = true, optional = true }
86-
# ocaml-interop = { git = "https://github.com/tizoc/ocaml-interop.git", branch = "closure-values", optional = true }
8772
reqwest = { workspace = true, features = ["blocking"] }
8873

8974
[dev-dependencies]

‎macros/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ quote = { workspace = true }
1414
syn = { workspace = true }
1515

1616
[dev-dependencies]
17-
mina-core = { path = "../core" }
17+
mina-core = { workspace = true }
1818
tracing = { workspace = true }
1919
rust-format = { workspace = true, features = ["token_stream"] }
2020
anyhow = { workspace = true }

‎mina-p2p-messages/Cargo.toml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,27 @@ license = "Apache-2.0"
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10+
ark-ff = { workspace = true }
1011
ark-serialize = { workspace = true }
1112
base64 = { workspace = true }
1213
binprot = { workspace = true }
1314
binprot_derive = { workspace = true }
1415
blake2 = { workspace = true }
1516
bs58 = { workspace = true, features = ["check"] }
1617
derive_more = { workspace = true }
18+
graphannis-malloc_size_of = { workspace = true }
19+
graphannis-malloc_size_of_derive = { workspace = true }
1720
hex = { workspace = true }
1821
lazy_static = { workspace = true }
22+
mina-curves = { workspace = true }
23+
mina-hasher = { workspace = true }
24+
mina-macros = { workspace = true }
25+
mina-signer = { workspace = true }
1926
num-bigint = { workspace = true }
27+
o1-utils = { workspace = true }
28+
poseidon = { workspace = true }
29+
rsexp = { workspace = true }
30+
rsexp-derive = { workspace = true }
2031
serde = { workspace = true }
2132
serde_bytes = { workspace = true }
2233
serde_json = { workspace = true }
@@ -26,21 +37,6 @@ strum_macros = { workspace = true }
2637
thiserror = { workspace = true }
2738
time = { workspace = true }
2839

29-
mina-macros = { path = "../macros" }
30-
31-
mina-curves = { workspace = true }
32-
mina-hasher = { workspace = true }
33-
mina-signer = { workspace = true }
34-
o1-utils = { workspace = true }
35-
poseidon = { workspace = true }
36-
37-
ark-ff = { workspace = true }
38-
rsexp = { workspace = true }
39-
rsexp-derive = { workspace = true }
40-
41-
graphannis-malloc_size_of = { workspace = true }
42-
graphannis-malloc_size_of_derive = { workspace = true }
43-
4440
[target.'cfg(fuzzing)'.dev-dependencies]
4541
fuzzcheck = { workspace = true }
4642

‎node/Cargo.toml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,22 @@ ark-ff = { workspace = true }
1313
base64 = { workspace = true }
1414
blake2 = { workspace = true }
1515
derive_more = { workspace = true }
16+
graphannis-malloc_size_of = { workspace = true }
17+
graphannis-malloc_size_of_derive = { workspace = true }
1618
hex = { workspace = true }
1719
lazy_static = { workspace = true }
1820
ledger = { workspace = true }
21+
mina-core = { path = "../core" }
1922
mina-curves = { workspace = true }
2023
mina-hasher = { workspace = true }
24+
mina-node-account = { workspace = true }
2125
mina-p2p-messages = { workspace = true }
2226
mina-signer = { workspace = true }
2327
multihash = { workspace = true }
2428
num_enum = { workspace = true }
29+
p2p = { path = "../p2p" }
2530
poseidon = { workspace = true }
31+
postcard = { workspace = true }
2632
rand = { workspace = true }
2733
redux = { workspace = true }
2834
serde = { workspace = true }
@@ -31,22 +37,14 @@ serde_json = { workspace = true, features = [
3137
"arbitrary_precision",
3238
] }
3339
serde_with = { workspace = true, features = ["time_0_3"] }
40+
snark = { path = "../snark" }
41+
static_assertions = { workspace = true }
3442
strum = { workspace = true }
3543
strum_macros = { workspace = true }
3644
thiserror = { workspace = true }
3745
time = { workspace = true, features = ["parsing"] }
38-
vrf = { workspace = true }
39-
40-
graphannis-malloc_size_of = { workspace = true }
41-
graphannis-malloc_size_of_derive = { workspace = true }
42-
43-
mina-core = { path = "../core" }
44-
mina-node-account = { workspace = true }
45-
p2p = { path = "../p2p" }
46-
postcard = { workspace = true }
47-
snark = { path = "../snark" }
48-
static_assertions = { workspace = true }
4946
tokio = { workspace = true }
47+
vrf = { workspace = true }
5048

5149
[build-dependencies]
5250
regex = { workspace = true }

‎node/account/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ anyhow = { workspace = true }
1010
bs58 = { workspace = true }
1111
hex = { workspace = true }
1212
lazy_static = { workspace = true }
13-
mina-core = { path = "../../core" }
13+
mina-core = { workspace = true }
1414
mina-hasher = { workspace = true }
1515
mina-p2p-messages = { workspace = true }
1616
mina-signer = { workspace = true }

‎node/common/Cargo.toml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ binprot_derive = { workspace = true }
1212
bitflags = { workspace = true }
1313
jsonpath-rust = { workspace = true }
1414
ledger = { workspace = true }
15+
mina-core = { workspace = true }
1516
mina-p2p-messages = { workspace = true }
1617
mina-signer = { workspace = true }
18+
node = { workspace = true, features = ["replay"] }
1719
rand = { workspace = true }
1820
rayon = { workspace = true }
21+
rsa = { workspace = true }
1922
serde = { workspace = true }
2023
serde_json = { workspace = true }
2124
sha3 = { workspace = true }
@@ -24,10 +27,6 @@ tokio = { workspace = true, features = ["time", "macros"] }
2427
tracing = { workspace = true }
2528
vrf = { workspace = true }
2629

27-
mina-core = { path = "../../core" }
28-
node = { path = "../../node", features = ["replay"] }
29-
rsa = { workspace = true }
30-
3130
[target.'cfg(target_family = "wasm")'.dependencies]
3231
redux = { workspace = true }
3332
wasm-bindgen = { workspace = true }
@@ -48,7 +47,6 @@ aws-sdk-s3 = { workspace = true }
4847
google-cloud-storage = { workspace = true }
4948
google-cloud-auth = { workspace = true }
5049

51-
5250
[features]
5351
p2p-webrtc = ["node/p2p-webrtc"]
5452
p2p-libp2p = ["node/p2p-libp2p"]

‎node/invariants/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ path = "src/lib.rs"
1111
[dependencies]
1212
documented = { workspace = true }
1313
lazy_static = { workspace = true }
14-
node = { path = "../" }
14+
node = { workspace = true }
1515
redux = { workspace = true }
1616
serde = { workspace = true }
1717
serde_json = { workspace = true, features = [

0 commit comments

Comments
 (0)