diff --git a/crates/sui-core/src/unit_tests/move_package_publish_tests.rs b/crates/sui-core/src/unit_tests/move_package_publish_tests.rs index 65b8af5cb08f5..467744964f074 100644 --- a/crates/sui-core/src/unit_tests/move_package_publish_tests.rs +++ b/crates/sui-core/src/unit_tests/move_package_publish_tests.rs @@ -221,7 +221,6 @@ async fn test_generate_lock_file() { version = 1 manifest_digest = "1401DE1C3C3FF6D20EB27741A0A7B5D61E34836CB6C90ECC2F2DE97C47B4D0F9" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "Examples" }, { name = "Sui" }, diff --git a/external-crates/move/crates/move-package/src/lock_file/schema.rs b/external-crates/move/crates/move-package/src/lock_file/schema.rs index 824205ce3c2ce..711cc5a74ce28 100644 --- a/external-crates/move/crates/move-package/src/lock_file/schema.rs +++ b/external-crates/move/crates/move-package/src/lock_file/schema.rs @@ -11,7 +11,11 @@ use anyhow::{anyhow, bail, Context, Result}; use serde::{Deserialize, Serialize}; use tempfile::NamedTempFile; use toml::value::Value; -use toml_edit::{Item::Value as EItem, Value as EValue}; +use toml_edit::{ + ArrayOfTables, + Item::{self, Value as EItem}, + Value as EValue, +}; use move_compiler::editions::{Edition, Flavor}; @@ -193,7 +197,56 @@ pub(crate) fn write_prologue( })?; write!(file, "{}", prologue)?; + Ok(()) +} + +pub fn update_dependency_graph( + file: &mut LockFile, + manifest_digest: String, + deps_digest: String, + dependencies: Option, + dev_dependencies: Option, + packages: Option, +) -> Result<()> { + use toml_edit::value; + let mut toml_string = String::new(); + file.read_to_string(&mut toml_string)?; + let mut toml = toml_string.parse::()?; + let move_table = toml + .entry("move") + .or_insert(Item::Table(toml_edit::Table::new())) + .as_table_mut() + .ok_or_else(|| anyhow!("Could not find or create move table in Move.lock"))?; + // Update `manifest_digest` and `deps_digest` in `[move]` table section. + move_table["manifest_digest"] = value(manifest_digest); + move_table["deps_digest"] = value(deps_digest); + + // Update `dependencies = [ ... ]` in `[move]` table section. + if let Some(dependencies) = dependencies { + move_table["dependencies"] = Item::Value(dependencies.clone()); + } else { + move_table.remove("dependencies"); + } + + // Update `dev-dependencies = [ ... ]` in `[move]` table section. + if let Some(dev_dependencies) = dev_dependencies { + move_table["dev-dependencies"] = Item::Value(dev_dependencies.clone()); + } else { + move_table.remove("dev-dependencies"); + } + + // Update the [[move.package]] Array of Tables. + if let Some(packages) = packages { + toml["move"]["package"] = Item::ArrayOfTables(packages.clone()); + } else if let Some(packages_table) = toml["move"]["package"].as_table_mut() { + packages_table.remove("package"); + } + + file.set_len(0)?; + file.rewind()?; + write!(file, "{}", toml)?; + file.flush()?; Ok(()) } @@ -265,7 +318,7 @@ pub fn update_managed_address( environment: &str, managed_address_update: ManagedAddressUpdate, ) -> Result<()> { - use toml_edit::{value, Document, Item, Table}; + use toml_edit::{value, Document, Table}; let mut toml_string = String::new(); file.read_to_string(&mut toml_string)?; diff --git a/external-crates/move/crates/move-package/src/resolution/dependency_graph.rs b/external-crates/move/crates/move-package/src/resolution/dependency_graph.rs index 2476692df2545..146e24a8cbba5 100644 --- a/external-crates/move/crates/move-package/src/resolution/dependency_graph.rs +++ b/external-crates/move/crates/move-package/src/resolution/dependency_graph.rs @@ -9,7 +9,7 @@ use std::{ collections::{btree_map::Entry, BTreeMap, BTreeSet, VecDeque}, fmt, fs::File, - io::{BufWriter, Read, Write}, + io::{Read, Write}, path::{Path, PathBuf}, process::Command, }; @@ -1214,12 +1214,8 @@ impl DependencyGraph { /// This operation fails, writing nothing, if the graph contains a cycle, and can fail with an /// undefined output if it cannot be represented in a TOML file. pub fn write_to_lock(&self, install_dir: PathBuf) -> Result { - let lock = LockFile::new( - install_dir, - self.manifest_digest.clone(), - self.deps_digest.clone(), - )?; - let mut writer = BufWriter::new(&*lock); + use fmt::Write; + let mut writer = String::new(); self.write_dependencies_to_lock(self.root_package_id, &mut writer)?; @@ -1235,15 +1231,47 @@ impl DependencyGraph { self.write_dependencies_to_lock(*id, &mut writer)?; } - writer.flush()?; - std::mem::drop(writer); + let mut dependencies = None; + let mut dev_dependencies = None; + let mut packages = None; + if !writer.is_empty() { + let toml = writer.parse::()?; + if let Some(value) = toml.get("dependencies").and_then(|v| v.as_value()) { + dependencies = Some(value.clone()); + } + if let Some(value) = toml.get("dev-dependencies").and_then(|v| v.as_value()) { + dev_dependencies = Some(value.clone()); + } + packages = toml + .get("move") + .and_then(|m| m.as_table()) + .and_then(|move_table| move_table.get("package")) + .and_then(|v| v.as_array_of_tables().cloned()); + } + + use std::io::Seek; + let mut lock = LockFile::new( + install_dir, + self.manifest_digest.clone(), + self.deps_digest.clone(), + )?; + lock.flush()?; + lock.rewind()?; + schema::update_dependency_graph( + &mut lock, + self.manifest_digest.clone(), + self.deps_digest.clone(), + dependencies, + dev_dependencies, + packages, + )?; Ok(lock) } /// Helper function to output the dependencies and dev-dependencies of `name` from this /// dependency graph, to the lock file under `writer`. - fn write_dependencies_to_lock( + fn write_dependencies_to_lock( &self, id: PackageIdentifier, writer: &mut W, diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked index e9cbfcd422d89..b24681e3909af 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked @@ -4,12 +4,10 @@ version = 1 manifest_digest = "98BBCE8D1C29472825E598691218A0CBC5BDA1A56C4429F5C2311C245DEC28CE" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" - dependencies = [ { name = "A" }, { name = "C" }, ] - dev-dependencies = [ { name = "B" }, ] diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.locked index be09cb4ff551d..c7377f96decd9 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "A4DB860CC2BC78C04706A7383CA52121876F87057538DF814C66F7EE6025E644" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" - dependencies = [ { name = "OtherDep", digest = "A666AE1AFDBA7E287476E851C0011503D19EE73E89CBDB307D4E0067E8BBA22C", addr_subst = { "A" = "B" } }, ] diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked index 9076664a56d0e..eb2cf9c1022e8 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked @@ -4,11 +4,9 @@ version = 1 manifest_digest = "CB01A8B6F9859E70A0A5DA10F8547C13EDDD63E9EDF72E930DD37C8EFC41F3F3" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" - dependencies = [ { name = "C" }, ] - dev-dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked index ba241fc903443..eaff0bbd7fbe3 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "B06FCED8E0EF6B62EC0B572DC233C0D70206B1C10EEDEA0403CA64AFBB3E439B" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked index 04b2fcf2d0d96..32470204a8691 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "82E01E336DD3374BDC42CA355AB6ACA69E44DB65E36DC0A831F36B06F6832574" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" - dependencies = [ { name = "A" }, { name = "ADep" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked index fd95ad0552c63..a110e615d8d00 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "E1BD09BE802FCCF437672321DEBFD0C8000F9D4A0AC5E54ED432087ABACA9667" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" - dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked index 6ad3dcab15371..9182e1a8b039c 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "86DBE490660052E70AF19AEB6DB3CDFE90F770D67E008E12C753575AB346B43C" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" - dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked index 37a9049b0c38b..6ba0b09a275a6 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "F64B7E3BA42923C4AFD7490B03D34813BA434044DC83D46F869DD5BB9A6052B2" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" - dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked index 1b7c5a992b188..2c3465a433467 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "B2F5516D0E0D7FC1D1A91EF42181BC28609979CA8D75F7EF01B473AF22303C1D" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" - dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked index 7f725a83a5d20..9d781bbe1be6a 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "88451CA3B87F330C2224714E02829B02787D5AEA4F9CCD9FF239ED0344CF0632" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" - dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked index 11d07670c53ac..69fe3f2d4ffca 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "2CE4CA7B1785FEAE60C59A993DB1182E09DB665E694C6104DF566E065752C030" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "A", addr_subst = { "AA" = "0000000000000000000000000000000000000000000000000000000000000001" } }, { name = "B", addr_subst = { "BA" = "0000000000000000000000000000000000000000000000000000000000000001" } }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked index d4821bd9ab7fc..d23e98a91ce6e 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "373B3598A66D05FBD7DE398D2F588C9C79C9F38757140E8717C1D851CBC5C15F" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/external/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external/Move.locked index 039aa0e87c58a..bb5c29fda5b1d 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/external/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "8D09D19521F36950C0698F14ED09FE4F6175C022796F1E401F2F5A1BCA6FCE98" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" - dependencies = [ { name = "A" }, ] diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.locked index 08b187afce586..f2daba05e02f5 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "725168ABE1A1677C13C020BCA80D7C059B53A9C7E2E4D15FD0BE671E0D2A87B0" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" - dependencies = [ { name = "A" }, ] diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.locked index 90bce81d54b5b..f27acd25a4901 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.locked @@ -4,11 +4,9 @@ version = 1 manifest_digest = "84A0B503BE9F9B341AC66860713D12704876E5C2425891E3B94626B12E4313E5" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "A" }, ] - dev-dependencies = [ { name = "B" }, ] diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.locked index d5f962755c454..8a2e91fc9e87b 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "2401A97D2FE979752E0726963BFC3F677A4FA8041F3C6FAE5A4302401B165463" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "A" }, { name = "ADep" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.locked index bc3f2c168559d..3bfd65299e533 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "C5119AF40DAACF1DF25E8E9DE830EC0EA839A29E62D7081BF217B49B10BD6980" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" - dependencies = [ { name = "A" }, ] diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked index 290edb88f6b75..699d96b0877b8 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "846084292F5A72B3CFE28402E76C1F3F172C3001C90FAAC19221D4B178A84EDB" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "C" }, { name = "D" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.locked index e4f54f4f22830..32251741bb71b 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "598DCC919F7378E59F328E1B448D1AAC70B8F34894146860B3ABF46600F9F79B" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" - dependencies = [ { name = "MoveNursery" }, ] diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.locked index 1430ea5bfd062..8e108b935b364 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "CD8925BBAAE2A64C347B3D48466097B55E04876C226546516D83EDC58C0BBB3A" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" - dependencies = [ { name = "Nested" }, ] diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move.locked index 1430ea5bfd062..8e108b935b364 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "CD8925BBAAE2A64C347B3D48466097B55E04876C226546516D83EDC58C0BBB3A" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" - dependencies = [ { name = "Nested" }, ] diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.locked index d06095bd79381..fdbd8ccc2ccb6 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "5005BF461ECC5281FE314371B38D8C163C5395D7455B91BEA0F63C1BCFD57551" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" - dependencies = [ { name = "More" }, { name = "Nested" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.locked index 83c68a119b4df..88295ba4535a1 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "0C66C2C067539518C3189E86B5A09D478C872C0F97ACE6D707AE9753319E56AA" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" - dependencies = [ { name = "OtherDep", addr_subst = { "A" = "B" } }, ] diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.locked index 9cd03797160ea..11a4c51c6fe2c 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "9DE3FDE63E3A9E1827A3D28769FE454A274BEF7DC0514AEEA9076DE876F2C361" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" - dependencies = [ { name = "OtherDep", digest = "BAD_DIGEST", addr_subst = { "A" = "B" } }, ] diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.locked index 0f50aef4832a7..b588fdebfe04b 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "340302CAC58F9844D483E9F19F08D9578B90043E621D953A62A4B679F8D98896" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" - dependencies = [ { name = "OtherDep", addr_subst = { "A" = "B" } }, ] diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.locked index d29e6e57b9d91..036746c49648d 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "6F18190939664D7ECC8F2DC327E079037A743E0CFF3FA5F72DABD2B6B5C3D200" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "A-resolved", addr_subst = { "AA" = "0000000000000000000000000000000000000000000000000000000000000001" } }, { name = "B-resolved", addr_subst = { "BA" = "0000000000000000000000000000000000000000000000000000000000000001" } }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.locked index 823d36c53753e..6f143c15caba1 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "A152DBB11C386226B7A6435D66090103E0CC19330A38251784E4D2D0C0EF57A5" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.locked index 37fe7cb33c910..16b8078a0cda6 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "88C81CA573217383E355274A37F0C6171DDE43ED835A166B0D6446C294788F65" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.locked index 8f61e00370cdd..3989566e52036 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "66CAE9439801A11D189DACA1182DFEF8BF0CA1C5F043F966D466CD7E7C486FB3" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.locked index 0ba0a4a003b0b..07833475b4fce 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "E301B66162FDBFF21CE0504F64D66F3F9CFE1FC85B6675A3D91C417A41284EEA" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.locked index cc31d110caabc..132a005333174 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "99C31161E1ED00C7621A2403D3513580715CA556C77C3C26FB1233B0778291AF" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" - dependencies = [ { name = "A" }, { name = "B" }, diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.locked index a1f2b3f93ad6b..fcb78e34ad4fd 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.locked @@ -4,7 +4,6 @@ version = 1 manifest_digest = "84867C472017C20EFC5FF536C440568833A0F592C104B9F9EF5CD5A27D109CDB" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" - dependencies = [ { name = "A" }, { name = "B" },