From b95073e5c98aaf53ba6f32186581c16c2dee2da8 Mon Sep 17 00:00:00 2001 From: DaughterOfMars Date: Tue, 20 Aug 2024 03:14:39 -0400 Subject: [PATCH] fix(CI): Fix `move-cli` tests (#1872) * fix(CI): Fix `move-cli` tests * update ahash and remove unused dep --------- Co-authored-by: Thoralf-M <46689931+Thoralf-M@users.noreply.github.com> Co-authored-by: Thibault Martinez --- Cargo.lock | 1 - external-crates/move/Cargo.lock | 9 ++++----- external-crates/move/crates/move-cli/Cargo.toml | 1 - .../tests/build_tests/migration/Move.toml.expected | 1 - .../migration_address_block/Move.toml.expected | 1 - .../build_tests/migration_multiline/Move.toml.expected | 1 - .../tests/build_tests/migration_names/Move.toml.expected | 1 - .../migration_names_mut_allowed/Move.toml.expected | 1 - .../tests/build_tests/migration_paths/Move.toml.expected | 1 - .../migration_with_blocking_errors/Move.toml.expected | 1 - 10 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d379688b09..75bfddf0eec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8369,7 +8369,6 @@ dependencies = [ "move-ir-types", "move-package", "move-prover", - "move-read-write-set-types", "move-stdlib", "move-unit-test", "move-vm-profiler", diff --git a/external-crates/move/Cargo.lock b/external-crates/move/Cargo.lock index 65f6a0ab413..42f4a12c1b6 100644 --- a/external-crates/move/Cargo.lock +++ b/external-crates/move/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom 0.2.9", "once_cell", @@ -1133,7 +1133,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.8", ] [[package]] @@ -1315,7 +1315,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ab388864246d58a276e60e7569a833d9cc4cd75c66e5ca77c177dad38e59996" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.8", "dashmap", "hashbrown 0.12.3", "once_cell", @@ -1724,7 +1724,6 @@ dependencies = [ "move-ir-types", "move-package", "move-prover", - "move-read-write-set-types", "move-stdlib", "move-unit-test", "move-vm-profiler", diff --git a/external-crates/move/crates/move-cli/Cargo.toml b/external-crates/move/crates/move-cli/Cargo.toml index e6070f0ea8a..222be24afad 100644 --- a/external-crates/move/crates/move-cli/Cargo.toml +++ b/external-crates/move/crates/move-cli/Cargo.toml @@ -36,7 +36,6 @@ move-errmapgen.workspace = true move-ir-types.workspace = true move-package.workspace = true move-prover.workspace = true -move-read-write-set-types.workspace = true move-stdlib.workspace = true move-unit-test.workspace = true move-vm-profiler.workspace = true diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration/Move.toml.expected b/external-crates/move/crates/move-cli/tests/build_tests/migration/Move.toml.expected index dba667925d2..763008694ba 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration/Move.toml.expected +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration/Move.toml.expected @@ -1,4 +1,3 @@ - # TOML FILE [package] diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration_address_block/Move.toml.expected b/external-crates/move/crates/move-cli/tests/build_tests/migration_address_block/Move.toml.expected index dba667925d2..763008694ba 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration_address_block/Move.toml.expected +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration_address_block/Move.toml.expected @@ -1,4 +1,3 @@ - # TOML FILE [package] diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration_multiline/Move.toml.expected b/external-crates/move/crates/move-cli/tests/build_tests/migration_multiline/Move.toml.expected index dba667925d2..763008694ba 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration_multiline/Move.toml.expected +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration_multiline/Move.toml.expected @@ -1,4 +1,3 @@ - # TOML FILE [package] diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration_names/Move.toml.expected b/external-crates/move/crates/move-cli/tests/build_tests/migration_names/Move.toml.expected index dba667925d2..763008694ba 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration_names/Move.toml.expected +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration_names/Move.toml.expected @@ -1,4 +1,3 @@ - # TOML FILE [package] diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration_names_mut_allowed/Move.toml.expected b/external-crates/move/crates/move-cli/tests/build_tests/migration_names_mut_allowed/Move.toml.expected index dba667925d2..763008694ba 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration_names_mut_allowed/Move.toml.expected +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration_names_mut_allowed/Move.toml.expected @@ -1,4 +1,3 @@ - # TOML FILE [package] diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration_paths/Move.toml.expected b/external-crates/move/crates/move-cli/tests/build_tests/migration_paths/Move.toml.expected index 05a21e75054..c64e0b3b7f0 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration_paths/Move.toml.expected +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration_paths/Move.toml.expected @@ -1,4 +1,3 @@ - # TOML FILE [package] diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration_with_blocking_errors/Move.toml.expected b/external-crates/move/crates/move-cli/tests/build_tests/migration_with_blocking_errors/Move.toml.expected index 789a5ab4dc2..e476046ac69 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration_with_blocking_errors/Move.toml.expected +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration_with_blocking_errors/Move.toml.expected @@ -1,4 +1,3 @@ - # TOML FILE [package]