Skip to content

Commit 627a72a

Browse files
authored
[move] Fix toml issues with move-execution (#17130)
## Description - The move execution crates were not included in the `external-crates/move/Cargo.toml`, leading to all sorts of issues ## Test plan - CI --- ## Release notes Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required. For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates. - [ ] Protocol: - [ ] Nodes (Validators and Full nodes): - [ ] Indexer: - [ ] JSON-RPC: - [ ] GraphQL: - [ ] CLI: - [ ] Rust SDK:
1 parent 90fe195 commit 627a72a

File tree

319 files changed

+10804
-25907
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

319 files changed

+10804
-25907
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,26 @@ resolver = "2"
33

44
members = [
55
"crates/*",
6+
"move-execution/v0/crates/bytecode-verifier-tests",
7+
"move-execution/v1/crates/bytecode-verifier-tests",
8+
"move-execution/v2/crates/bytecode-verifier-tests",
9+
# "move-execution/$CUT/crates/bytecode-verifier-tests",
10+
"move-execution/v0/crates/invalid-mutations",
11+
"move-execution/v1/crates/invalid-mutations",
12+
"move-execution/v2/crates/invalid-mutations",
13+
# "move-execution/$CUT/crates/invalid-mutations",
14+
"move-execution/v0/crates/move-bytecode-verifier",
15+
"move-execution/v1/crates/move-bytecode-verifier",
16+
"move-execution/v2/crates/move-bytecode-verifier",
17+
# "move-execution/$CUT/crates/move-bytecode-verifier",
18+
"move-execution/v0/crates/move-vm-runtime",
19+
"move-execution/v1/crates/move-vm-runtime",
20+
"move-execution/v2/crates/move-vm-runtime",
21+
# "move-execution/$CUT/crates/move-vm-runtime",
22+
"move-execution/v0/crates/move-stdlib",
23+
"move-execution/v1/crates/move-stdlib",
24+
"move-execution/v2/crates/move-stdlib",
25+
# "move-execution/$CUT/crates/move-stdlib",
626
]
727

828
# Dependencies that should be kept in sync through the whole workspace

crates/bytecode-verifier-tests/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ proptest.workspace = true
1515
fail = { workspace = true, features = ["failpoints"] }
1616
hex.workspace = true
1717

18-
invalid-mutations.workspace = true
18+
# referred to via path for execution versioning
19+
invalid-mutations = { path = "../invalid-mutations" }
1920
move-binary-format = { workspace = true, features = ["fuzzing"] }
2021
move-bytecode-verifier.workspace = true
2122
move-bytecode-verifier-meter.workspace = true

crates/move-bytecode-verifier/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ move-abstract-stack.workspace = true
2121

2222
[dev-dependencies]
2323
hex-literal.workspace = true
24-
invalid-mutations.workspace = true
24+
# referred to via path for execution versioning
25+
invalid-mutations = { path = "../invalid-mutations" }
2526

2627
[features]
2728
default = []

crates/move-stdlib/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ move-prover.workspace = true
1818
move-vm-types.workspace = true
1919
move-binary-format.workspace = true
2020
move-core-types.workspace = true
21+
# referred to via path for execution versioning
2122
move-vm-runtime = { path = "../move-vm-runtime" }
2223
log.workspace = true
2324
walkdir.workspace = true

crates/move-vm-runtime/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ sha3.workspace = true
2020
tracing.workspace = true
2121
smallvec.workspace = true
2222

23+
# referred to via path for execution versioning
2324
move-bytecode-verifier = { path = "../move-bytecode-verifier" }
2425
move-core-types.workspace = true
2526
move-vm-config.workspace = true

move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml renamed to move-execution/v0/crates/bytecode-verifier-tests/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "bytecode-verifier-tests"
2+
name = "bytecode-verifier-tests-v0"
33
version = "0.1.0"
44
authors = ["Diem Association <[email protected]>"]
55
description = "Diem bytecode verifier tests"
@@ -15,9 +15,9 @@ proptest.workspace = true
1515
fail = { workspace = true, features = ['failpoints']}
1616
hex.workspace = true
1717

18-
invalid-mutations.workspace = true
18+
invalid-mutations = { path = "../invalid-mutations", package = "invalid-mutations-v0" }
1919
move-binary-format = { workspace = true, features = ["fuzzing"] }
20-
move-bytecode-verifier.workspace = true
20+
move-bytecode-verifier = { path = "../move-bytecode-verifier", package = "move-bytecode-verifier-v0" }
2121
move-bytecode-verifier-meter.workspace = true
2222
move-core-types.workspace = true
2323
move-vm-config.workspace = true

0 commit comments

Comments
 (0)