Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@georgemitenkov
georgemitenkov committed Dec 5, 2024
1 parent 5803cb1 commit e88cfa2
Show file tree
Hide file tree
Showing 15 changed files with 36 additions and 35 deletions.
22 changes: 11 additions & 11 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -841,8 +841,12 @@ z3tracer = "0.8.0"
# MOVE DEPENDENCIES
move-abigen = { path = "third_party/move/move-prover/move-abigen" }
move-binary-format = { path = "third_party/move/move-binary-format" }
move-borrow-graph = { path = "third_party/move/move-borrow-graph" }
move-bytecode-source-map = { path = "third_party/move/move-ir-compiler/move-bytecode-source-map" }
move-bytecode-spec = { path = "third_party/move/move-bytecode-spec" }
move-bytecode-verifier = { path = "third_party/move/move-bytecode-verifier" }
move-bytecode-verifier-invalid-mutations = { path = "third_party/move/move-bytecode-verifier/invalid-mutations" }
move-bytecode-viewer = { path = "third_party/move/tools/move-bytecode-viewer" }
move-bytecode-utils = { path = "third_party/move/tools/move-bytecode-utils" }
move-cli = { path = "third_party/move/tools/move-cli" }
move-command-line-common = { path = "third_party/move/move-command-line-common" }
Expand All @@ -853,25 +857,22 @@ move-core-types = { path = "third_party/move/move-core/types" }
move-decompiler = { path = "third_party/move/tools/move-decompiler" }
move-docgen = { path = "third_party/move/move-prover/move-docgen" }
move-disassembler = { path = "third_party/move/tools/move-disassembler" }
move-errmapgen = { path = "third_party/move/move-prover/move-errmapgen" }
move-ir-types = { path = "third_party/move/move-ir/types" }
move-ir-compiler = { path = "third_party/move/move-ir-compiler" }
move-ir-to-bytecode = { path = "third_party/move/move-ir-compiler/move-ir-to-bytecode" }
move-linter = { path = "third_party/move/tools/move-linter" }
move-borrow-graph = { path = "third_party/move/move-borrow-graph" }
move-bytecode-source-map = { path = "third_party/move/move-ir-compiler/move-bytecode-source-map" }
move-bytecode-viewer = { path = "third_party/move/tools/move-bytecode-viewer" }
move-errmapgen = { path = "third_party/move/move-prover/move-errmapgen" }
move-model = { path = "third_party/move/move-model" }
move-package = { path = "third_party/move/tools/move-package" }
move-prover = { path = "third_party/move/move-prover" }
move-prover-boogie-backend = { path = "third_party/move/move-prover/boogie-backend" }
move-prover-bytecode-pipeline = { path = "third_party/move/move-prover/bytecode-pipeline" }
move-stackless-bytecode = { path = "third_party/move/move-model/bytecode" }
move-stackless-bytecode-test-utils = { path = "third_party/move/move-model/bytecode-test-utils" }
move-prover-test-utils = { path = "third_party/move/move-prover/test-utils" }
aptos-move-stdlib = { path = "aptos-move/framework/move-stdlib" }
aptos-table-natives = { path = "aptos-move/framework/table-natives" }
move-prover-test-utils = { path = "third_party/move/move-prover/test-utils" }
move-resource-viewer = { path = "third_party/move/tools/move-resource-viewer" }
move-stackless-bytecode = { path = "third_party/move/move-model/bytecode" }
move-stackless-bytecode-test-utils = { path = "third_party/move/move-model/bytecode-test-utils" }
move-symbol-pool = { path = "third_party/move/move-symbol-pool" }
move-table-extension = { path = "third_party/move/extensions/move-table-extension" }
move-transactional-test-runner = { path = "third_party/move/testing-infra/transactional-test-runner" }
Expand Down
4 changes: 2 additions & 2 deletions testsuite/fuzzer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ aptos-types = { workspace = true }
arbitrary = { workspace = true }
base64 = "0.21.7"
bcs = { workspace = true }
clap = "4.5.20"
csv = "1.3.0"
clap = { workspace = true }
csv = { workspace = true }
dearbitrary = { workspace = true }
hex = { workspace = true }
move-binary-format = { workspace = true, features = ["fuzzing"] }
Expand Down
2 changes: 1 addition & 1 deletion third_party/move/evm/move-to-yul/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sha3 = { workspace = true }
datatest-stable = { workspace = true }
evm = { workspace = true }
evm-exec-utils = { path = "../exec-utils" }
move-prover-test-utils = { path = "../../move-prover/test-utils" }
move-prover-test-utils = { workspace = true }
move-stdlib = { path = "../../move-stdlib" }
tempfile = { workspace = true }
walkdir = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion third_party/move/move-bytecode-verifier/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ typed-arena = { workspace = true }

[dev-dependencies]
hex-literal = { workspace = true }
invalid-mutations = { path = "invalid-mutations" }
move-bytecode-verifier-invalid-mutations = { workspace = true }
2 changes: 1 addition & 1 deletion third_party/move/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ edition = "2021"
[dev-dependencies]
fail = { workspace = true, features = ['failpoints'] }
hex = { workspace = true }
invalid-mutations = { path = "../invalid-mutations" }
move-binary-format = { workspace = true, features = ["fuzzing"] }
move-bytecode-verifier = { workspace = true }
move-bytecode-verifier-invalid-mutations = { workspace = true }
move-core-types = { workspace = true }
petgraph = { workspace = true }
proptest = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions ..._party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/bounds_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// Copyright (c) The Move Contributors
// SPDX-License-Identifier: Apache-2.0

use invalid_mutations::bounds::{
ApplyCodeUnitBoundsContext, ApplyOutOfBoundsContext, CodeUnitBoundsMutation,
OutOfBoundsMutation,
};
use move_binary_format::{
check_bounds::BoundsChecker, file_format::*, file_format_common,
proptest_types::CompiledModuleStrategyGen,
};
use move_bytecode_verifier_invalid_mutations::bounds::{
ApplyCodeUnitBoundsContext, ApplyOutOfBoundsContext, CodeUnitBoundsMutation,
OutOfBoundsMutation,
};
use move_core_types::{
account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
};
Expand Down
2 changes: 1 addition & 1 deletion ...rty/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// Copyright (c) The Move Contributors
// SPDX-License-Identifier: Apache-2.0

use invalid_mutations::signature::{FieldRefMutation, SignatureRefMutation};
use move_binary_format::file_format::{
Bytecode::*, CompiledModule, SignatureToken::*, Visibility::Public, *,
};
use move_bytecode_verifier::{
verify_module, verify_module_with_config_for_test, SignatureChecker, VerifierConfig,
};
use move_bytecode_verifier_invalid_mutations::signature::{FieldRefMutation, SignatureRefMutation};
use move_core_types::{
account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
};
Expand Down
2 changes: 1 addition & 1 deletion third_party/move/move-bytecode-verifier/invalid-mutations/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "invalid-mutations"
name = "move-bytecode-verifier-invalid-mutations"
version = "0.1.0"
edition = "2021"
authors = ["Diem Association <[email protected]>"]
Expand Down
2 changes: 1 addition & 1 deletion third_party/move/move-compiler-v2/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ anyhow = { workspace = true }
datatest-stable = { workspace = true }
move-command-line-common = { workspace = true }
move-ir-types = { workspace = true }
move-prover-test-utils = { path = "../move-prover/test-utils" }
move-prover-test-utils = { workspace = true }
move-stdlib = { path = "../move-stdlib" }
walkdir = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion third_party/move/move-model/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ serde = { workspace = true, features = ["derive"] }

[dev-dependencies]
datatest-stable = { workspace = true }
move-prover-test-utils = { path = "../move-prover/test-utils" }
move-prover-test-utils = { workspace = true }

[[test]]
name = "testsuite"
Expand Down
2 changes: 1 addition & 1 deletion third_party/move/move-model/bytecode-test-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ move-command-line-common = { workspace = true }
move-compiler = { workspace = true }
move-compiler-v2 = { workspace = true }
move-model = { workspace = true }
move-prover-test-utils = { path = "../../move-prover/test-utils" }
move-prover-test-utils = { workspace = true }
move-stackless-bytecode = { workspace = true }
move-stdlib = { path = "../../move-stdlib" }
2 changes: 1 addition & 1 deletion third_party/move/move-prover/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ toml = { workspace = true }

[dev-dependencies]
datatest-stable = { workspace = true }
move-prover-test-utils = { path = "test-utils" }
move-prover-test-utils = { workspace = true }
shell-words = { workspace = true }
tempfile = { workspace = true }
walkdir = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion third_party/move/move-prover/move-abigen/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ serde = { workspace = true, features = ["derive"] }
codespan-reporting = { workspace = true }
datatest-stable = { workspace = true }
move-prover = { workspace = true }
move-prover-test-utils = { path = "../test-utils" }
move-prover-test-utils = { workspace = true }
tempfile = { workspace = true }

# force more deterministic tests
Expand Down
2 changes: 1 addition & 1 deletion third_party/move/move-prover/move-docgen/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ serde = { workspace = true, features = ["derive"] }
[dev-dependencies]
datatest-stable = { workspace = true }
move-prover = { workspace = true }
move-prover-test-utils = { path = "../test-utils" }
move-prover-test-utils = { workspace = true }
tempfile = { workspace = true }

[[test]]
Expand Down

0 comments on commit e88cfa2

Please sign in to comment.