Skip to content

Commit bb17719

Browse files
committed
Move salsa-simple from tools/ to vendor/ and alphabetize workspace
salsa-simple is not a tool but a vendored reimplementation of XSalsa20 with serde support, which the external salsa20 crate lacks. Moving it to vendor/ better reflects its purpose as a vendored dependency. Also alphabetized workspace members in Cargo.toml for better organization and removed duplicate ledger entry.
1 parent ad84b13 commit bb17719

File tree

5 files changed

+18
-21
lines changed

5 files changed

+18
-21
lines changed

Cargo.toml

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,34 @@
11
[workspace]
22
members = [
3+
"cli",
4+
"cli/replay_dynamic_effects",
35
"core",
4-
"macros",
6+
"fuzzer",
57
"ledger",
6-
"snark",
7-
"p2p",
8-
"p2p/testing",
9-
"p2p/libp2p-rpc-behaviour",
8+
"macros",
9+
"mina-p2p-messages",
1010
"node",
1111
"node/account",
1212
"node/common",
13-
"node/native",
14-
"node/web",
1513
"node/invariants",
14+
"node/native",
1615
"node/testing",
17-
"cli",
18-
"cli/replay_dynamic_effects",
19-
"vrf",
20-
21-
"mina-p2p-messages",
22-
"ledger",
16+
"node/web",
17+
"p2p",
18+
"p2p/libp2p-rpc-behaviour",
19+
"p2p/testing",
2320
"poseidon",
24-
25-
"tools/transport",
21+
"snark",
22+
"tools/archive-breadcrumb-compare",
2623
"tools/bootstrap-sandbox",
24+
"tools/fuzzing",
2725
"tools/gossipsub-sandbox",
2826
"tools/hash-tool",
2927
"tools/ledger-tool",
30-
"tools/salsa-simple",
31-
"tools/fuzzing",
32-
"tools/archive-breadcrumb-compare",
28+
"tools/transport",
3329
"tools/webrtc-sniffer",
34-
35-
"fuzzer",
30+
"vendor/salsa-simple",
31+
"vrf",
3632
]
3733

3834
resolver = "2"
@@ -195,7 +191,7 @@ rsexp = "0.2.3"
195191
rsexp-derive = "0.2.3"
196192
rsprocmaps = "0.3.2"
197193
rust-format = "0.3"
198-
salsa-simple = { path = "tools/salsa-simple" }
194+
salsa-simple = { path = "vendor/salsa-simple" }
199195
salsa20 = "0.10.2"
200196
serde = { version = "1.0.190", features = ["derive", "rc"] }
201197
serde_bytes = "0.11"

frontend/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ COPY p2p ./p2p
7474
COPY poseidon ./poseidon
7575
COPY snark ./snark
7676
COPY tools ./tools
77+
COPY vendor ./vendor
7778
COPY vrf ./vrf
7879

7980
# Build WebAssembly using Makefile (source VERGEN variables from .env.docker)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)