diff --git a/crates/sui-core/src/unit_tests/move_package_management_tests.rs b/crates/sui-core/src/unit_tests/move_package_management_tests.rs index feb538ca0fb32..f18baef04d94d 100644 --- a/crates/sui-core/src/unit_tests/move_package_management_tests.rs +++ b/crates/sui-core/src/unit_tests/move_package_management_tests.rs @@ -50,7 +50,7 @@ async fn test_manage_package_update() { # @generated by Move, please check-in and do not edit manually. [move] - version = 2 + version = 3 manifest_digest = "919A5B078B47AD46674F36E1605578927D5BC4536A7646D78D1320A25DDD57CC" deps_digest = "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855" 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 46701b411bdb5..84e619282e258 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 @@ -218,32 +218,32 @@ async fn test_generate_lock_file() { # @generated by Move, please check-in and do not edit manually. [move] - version = 2 + version = 3 manifest_digest = "4C5606BF71339416027A58BDB5BA2EF2F5E0929FCE98BAB8AFFCBC447AFE3A23" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "Examples" }, - { name = "Sui" }, + { id = "Examples", name = "Examples" }, + { id = "Sui", name = "Sui" }, ] [[move.package]] - name = "Examples" + id = "Examples" source = { local = "../object_basics" } dependencies = [ - { name = "Sui" }, + { id = "Sui", name = "Sui" }, ] [[move.package]] - name = "MoveStdlib" + id = "MoveStdlib" source = { local = "../../../../../sui-framework/packages/move-stdlib" } [[move.package]] - name = "Sui" + id = "Sui" source = { local = "../../../../../sui-framework/packages/sui-framework" } dependencies = [ - { name = "MoveStdlib" }, + { id = "MoveStdlib", name = "MoveStdlib" }, ] [move.toolchain-version] diff --git a/crates/sui-source-validation/src/toolchain.rs b/crates/sui-source-validation/src/toolchain.rs index 54f87f2e1b83a..888dc4e9e66f2 100644 --- a/crates/sui-source-validation/src/toolchain.rs +++ b/crates/sui-source-validation/src/toolchain.rs @@ -40,7 +40,7 @@ use tracing::{debug, info}; pub(crate) const CURRENT_COMPILER_VERSION: &str = env!("CARGO_PKG_VERSION"); const LEGACY_COMPILER_VERSION: &str = CURRENT_COMPILER_VERSION; // TODO: update this when Move 2024 is released -const PRE_TOOLCHAIN_MOVE_LOCK_VERSION: u64 = 0; // Used to detect lockfiles pre-toolchain versioning support +const PRE_TOOLCHAIN_MOVE_LOCK_VERSION: u16 = 0; // Used to detect lockfiles pre-toolchain versioning support const CANONICAL_UNIX_BINARY_NAME: &str = "sui"; const CANONICAL_WIN_BINARY_NAME: &str = "sui.exe"; 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 c4904198a74c2..2502bb9d5ef8c 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 @@ -31,7 +31,8 @@ use super::LockFile; /// V0: Base version. /// V1: Adds toolchain versioning support. /// V2: Adds support for managing addresses on package publish and upgrades. -pub const VERSION: u64 = 2; +/// V3: Renames dependency `name` field to `id` and adds a `name` field to store the name from the manifest. +pub const VERSION: u16 = 3; /// Table for storing package info under an environment. const ENV_TABLE_NAME: &str = "env"; @@ -56,8 +57,8 @@ pub struct Packages { #[derive(Deserialize)] pub struct Package { - /// The name of the package (corresponds to the name field from its source manifest). - pub name: String, + /// Package identifier (as resolved by the package hook). + pub id: String, /// Where to find this dependency. Schema is not described in terms of serde-compatible /// structs, so it is deserialized into a generic data structure. @@ -73,6 +74,9 @@ pub struct Package { #[derive(Deserialize)] pub struct Dependency { + /// Package identifier (as resolved by the package hook). + pub id: String, + /// The name of the dependency (corresponds to the key for the dependency in the depending /// package's source manifest). pub name: String, @@ -110,7 +114,7 @@ pub struct ManagedPackage { #[derive(Serialize, Deserialize)] pub struct Header { - pub version: u64, + pub version: u16, /// A hash of the manifest file content this lock file was generated from computed using SHA-256 /// hashing algorithm. pub manifest_digest: String, @@ -199,9 +203,9 @@ impl Header { let Schema { move_: header } = toml::de::from_str::>(contents).context("Deserializing lock header")?; - if header.version > VERSION { + if header.version != VERSION { bail!( - "Lock file format is too new, expected version {} or below, found {}", + "Lock file format mismatch, expected version {}, found {}", VERSION, header.version ); @@ -252,7 +256,8 @@ pub fn update_dependency_graph( .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. + // Update `version`, `manifest_digest`, and `deps_digest` in `[move]` table section. + move_table["version"] = value(VERSION as i64); move_table["manifest_digest"] = value(manifest_digest); move_table["deps_digest"] = value(deps_digest); 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 e5fea3ce123fb..bf15b755fd033 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 @@ -232,6 +232,7 @@ impl DependencyGraphBuilder { let lock_file = File::open(lock_path); let digest_and_lock_contents = lock_file .map(|mut lock_file| match schema::Header::read(&mut lock_file) { + Ok(header) if header.version < schema::VERSION => None, // outdated lock file - regenerate Ok(header) => Some((header.manifest_digest, header.deps_digest, lock_string_opt)), Err(_) => None, // malformed header - regenerate lock file }) @@ -1066,39 +1067,41 @@ impl DependencyGraph { package_graph.add_node(root_package_id); for schema::Dependency { - name, + id: dep_id, + name: dep_name, subst, digest, } in packages.root_dependencies.into_iter().flatten() { package_graph.add_edge( root_package_id, - Symbol::from(name.as_str()), + PackageIdentifier::from(dep_id.as_str()), Dependency { mode: DependencyMode::Always, subst: subst.map(parse_substitution).transpose()?, digest: digest.map(Symbol::from), dep_override: false, - dep_name: PM::PackageName::from(name), + dep_name: PM::PackageName::from(dep_name), }, ); } for schema::Dependency { - name, + id: dep_id, + name: dep_name, subst, digest, } in packages.root_dev_dependencies.into_iter().flatten() { package_graph.add_edge( root_package_id, - Symbol::from(name.as_str()), + PackageIdentifier::from(dep_id.as_str()), Dependency { mode: DependencyMode::DevOnly, subst: subst.map(parse_substitution).transpose()?, digest: digest.map(Symbol::from), dep_override: false, - dep_name: PM::PackageName::from(name.as_str()), + dep_name: PM::PackageName::from(dep_name), }, ); } @@ -1106,30 +1109,30 @@ impl DependencyGraph { // Fill in the remaining dependencies, and the package source information from the lock // file. for schema::Package { - name: pkg_name, + id: pkg_id, source, version, dependencies, dev_dependencies, } in packages.packages.into_iter().flatten() { - let pkg_name = PM::PackageName::from(pkg_name.as_str()); - let source = parse_dependency(pkg_name.as_str(), source) - .with_context(|| format!("Deserializing dependency '{pkg_name}'"))?; + let pkg_id = PackageIdentifier::from(pkg_id.as_str()); + let source = parse_dependency(pkg_id.as_str(), source) + .with_context(|| format!("Deserializing dependency '{pkg_id}'"))?; let source = match source { PM::Dependency::Internal(source) => source, PM::Dependency::External(resolver) => { - bail!("Unexpected dependency '{pkg_name}' resolved externally by '{resolver}'"); + bail!("Unexpected dependency '{pkg_id}' resolved externally by '{resolver}'"); } }; if source.subst.is_some() { - bail!("Unexpected 'addr_subst' in source for '{pkg_name}'") + bail!("Unexpected 'addr_subst' in source for '{pkg_id}'") } if source.digest.is_some() { - bail!("Unexpected 'digest' in source for '{pkg_name}'") + bail!("Unexpected 'digest' in source for '{pkg_id}'") } let pkg = Package { @@ -1138,7 +1141,7 @@ impl DependencyGraph { version: version.map(Symbol::from), }; - match package_table.entry(pkg_name) { + match package_table.entry(pkg_id) { Entry::Vacant(entry) => { entry.insert(pkg); } @@ -1148,7 +1151,7 @@ impl DependencyGraph { Entry::Occupied(entry) => { bail!( "Conflicting dependencies found:\n{0} = {1}\n{0} = {2}", - pkg_name, + pkg_id, PackageWithResolverTOML(entry.get()), PackageWithResolverTOML(&pkg), ); @@ -1156,14 +1159,15 @@ impl DependencyGraph { }; for schema::Dependency { + id: dep_id, name: dep_name, subst, digest, } in dependencies.into_iter().flatten() { package_graph.add_edge( - pkg_name, - PM::PackageName::from(dep_name.as_str()), + pkg_id, + PackageIdentifier::from(dep_id.as_str()), Dependency { mode: DependencyMode::Always, subst: subst.map(parse_substitution).transpose()?, @@ -1175,14 +1179,15 @@ impl DependencyGraph { } for schema::Dependency { + id: dep_id, name: dep_name, subst, digest, } in dev_dependencies.into_iter().flatten() { package_graph.add_edge( - pkg_name, - PM::PackageName::from(dep_name.as_str()), + pkg_id, + PackageIdentifier::from(dep_id.as_str()), Dependency { mode: DependencyMode::DevOnly, subst: subst.map(parse_substitution).transpose()?, @@ -1232,7 +1237,7 @@ impl DependencyGraph { for (id, pkg) in &self.package_table { writeln!(writer, "\n[[move.package]]")?; - writeln!(writer, "name = {}", str_escape(id.as_str())?)?; + writeln!(writer, "id = {}", str_escape(id.as_str())?)?; writeln!(writer, "source = {}", PackageTOML(pkg))?; if let Some(version) = &pkg.version { writeln!(writer, "version = {}", str_escape(version.as_str())?)?; @@ -1566,20 +1571,23 @@ impl<'a> fmt::Display for PackageWithResolverTOML<'a> { impl<'a> fmt::Display for DependencyTOML<'a> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let DependencyTOML( - name, + id, Dependency { mode: _, subst, digest, dep_override: _, - dep_name: _, + dep_name, }, ) = self; f.write_str("{ ")?; - write!(f, "name = ")?; - f.write_str(&str_escape(name.as_str())?)?; + write!(f, "id = ")?; + f.write_str(&str_escape(id.as_str())?)?; + + write!(f, ", name = ")?; + f.write_str(&str_escape(dep_name.as_str())?)?; if let Some(digest) = digest { write!(f, ", digest = ")?; diff --git a/external-crates/move/crates/move-package/src/source_package/manifest_parser.rs b/external-crates/move/crates/move-package/src/source_package/manifest_parser.rs index d2ff820047089..0cd8d03e01b49 100644 --- a/external-crates/move/crates/move-package/src/source_package/manifest_parser.rs +++ b/external-crates/move/crates/move-package/src/source_package/manifest_parser.rs @@ -329,7 +329,7 @@ fn parse_address_literal(address_str: &str) -> Result Result { +pub fn parse_dependency(dep_id: &str, mut tval: TV) -> Result { let Some(table) = tval.as_table_mut() else { bail!("Malformed dependency {}", tval); }; @@ -432,7 +432,7 @@ pub fn parse_dependency(dep_name: &str, mut tval: TV) -> Result .ok_or_else(|| anyhow!("'subdir' not a string"))?, }; - let package_name = Symbol::from(dep_name); + let package_name = Symbol::from(dep_id); PM::DependencyKind::Custom(PM::CustomDepInfo { node_url, diff --git a/external-crates/move/crates/move-package/tests/test_dependency_graph.rs b/external-crates/move/crates/move-package/tests/test_dependency_graph.rs index ebcab116022dd..b648942a1cbfe 100644 --- a/external-crates/move/crates/move-package/tests/test_dependency_graph.rs +++ b/external-crates/move/crates/move-package/tests/test_dependency_graph.rs @@ -124,7 +124,11 @@ fn lock_file_missing_dependency() { .expect("Creating new lock file"); // Write a reference to a dependency that there isn't package information for. - writeln!(&*lock, r#"dependencies = [{{ name = "OtherDep" }}]"#).unwrap(); + writeln!( + &*lock, + r#"dependencies = [{{ id = "OtherDep", name = "OtherDep" }}]"# + ) + .unwrap(); lock.commit(&commit).expect("Writing partial lock file"); let Err(err) = DependencyGraph::read_from_lock( @@ -619,61 +623,61 @@ fn dev_dep_test_package() -> PathBuf { const EMPTY_LOCK: &str = r#" [move] -version = 0 +version = 3 manifest_digest = "42" deps_digest = "" "#; const A_LOCK: &str = r#" [move] -version = 0 +version = 3 manifest_digest = "42" deps_digest = "7" dependencies = [ - { name = "A" }, + { id = "A", name = "A" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "./A" } "#; const AB_LOCK: &str = r#" [move] -version = 0 +version = 3 manifest_digest = "42" deps_digest = "7" dependencies = [ - { name = "A" }, - { name = "B" }, + { id = "A", name = "A" }, + { id = "B", name = "A" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "./A" } [[move.package]] -name = "B" +id = "B" source = { local = "./B" } "#; const A_DEP_B_LOCK: &str = r#" [move] -version = 0 +version = 3 manifest_digest = "42" deps_digest = "7" dependencies = [ - { name = "A" }, + { id = "A", name = "A" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "./A" } dependencies = [ - { name = "B" }, + { id = "B", name = "A" }, ] [[move.package]] -name = "B" +id = "B" source = { local = "./B" } "#; diff --git a/external-crates/move/crates/move-package/tests/test_lock_file.rs b/external-crates/move/crates/move-package/tests/test_lock_file.rs index 452ecbeaff372..60d62af3f022b 100644 --- a/external-crates/move/crates/move-package/tests/test_lock_file.rs +++ b/external-crates/move/crates/move-package/tests/test_lock_file.rs @@ -96,16 +96,16 @@ flavor = "sui" # @generated by Move, please check-in and do not edit manually. [move] - version = 1 + version = 3 manifest_digest = "0" deps_digest = "0" dependencies = [ - { name = "Dep" } + { id = "Dep", name = "Dep" } ] [[move.package]] - name = "Dep" + id = "Dep" source = { local = "some/path" } "#; fs::write(lock_path_with_graph.clone(), lock_graph_contents).unwrap(); @@ -135,15 +135,15 @@ flavor = "sui" # @generated by Move, please check-in and do not edit manually. [move] - version = 1 + version = 3 manifest_digest = "0" deps_digest = "0" dependencies = [ - { name = "Dep" }, + { id = "Dep", name = "Dep" }, ] [[move.package]] - name = "Dep" + id = "Dep" source = { local = "some/path" } [move.toolchain-version] diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.locked index f9e4c5cb2c1f7..0532d57b75984 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.locked @@ -1,6 +1,6 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "919A5B078B47AD46674F36E1605578927D5BC4536A7646D78D1320A25DDD57CC" deps_digest = "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855" diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked index 53a4e43bc8db6..1f5b1eca3f5fd 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked @@ -1,6 +1,6 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "151286C56FC37AEF93D980A892F558C8EE65FBF062991BDF23C9FC88478D3648" deps_digest = "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855" 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 c3237740cfe1a..ef3a0e9ee9c3d 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 @@ -1,41 +1,41 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "98BBCE8D1C29472825E598691218A0CBC5BDA1A56C4429F5C2311C245DEC28CE" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ - { name = "A" }, - { name = "C" }, + { id = "A", name = "A" }, + { id = "C", name = "C" }, ] dev-dependencies = [ - { name = "B" }, + { id = "B", name = "B" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "B" }, + { id = "B", name = "B" }, ] dev-dependencies = [ - { name = "D" }, + { id = "D", name = "D" }, ] [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } dev-dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C" } [[move.package]] -name = "D" +id = "D" source = { local = "deps_only/D" } 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 be3f6885701eb..0d99c2ea197bd 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 @@ -1,13 +1,13 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "A4DB860CC2BC78C04706A7383CA52121876F87057538DF814C66F7EE6025E644" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ - { name = "OtherDep", digest = "A666AE1AFDBA7E287476E851C0011503D19EE73E89CBDB307D4E0067E8BBA22C", addr_subst = { "A" = "B" } }, + { id = "OtherDep", name = "OtherDep", digest = "A666AE1AFDBA7E287476E851C0011503D19EE73E89CBDB307D4E0067E8BBA22C", addr_subst = { "A" = "B" } }, ] [[move.package]] -name = "OtherDep" +id = "OtherDep" source = { local = "deps_only/other_dep" } 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 42c70993e3498..b0bbb4fd01a3b 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 @@ -1,33 +1,33 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "CB01A8B6F9859E70A0A5DA10F8547C13EDDD63E9EDF72E930DD37C8EFC41F3F3" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] dev-dependencies = [ - { name = "A" }, - { name = "B" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dev-dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } dev-dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C-v1" } 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 4926f3c472087..67fa8bcb1984e 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 @@ -1,30 +1,30 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "B06FCED8E0EF6B62EC0B572DC233C0D70206B1C10EEDEA0403CA64AFBB3E439B" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "A" }, - { name = "B" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "ADep" }, + { id = "ADep", name = "ADep" }, ] [[move.package]] -name = "ADep" +id = "ADep" source = { local = "deps_only/ADep" } [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } dependencies = [ - { name = "ADep" }, + { id = "ADep", name = "ADep" }, ] 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 7896e12c4aa77..2e12d93217a61 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 @@ -1,31 +1,31 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "82E01E336DD3374BDC42CA355AB6ACA69E44DB65E36DC0A831F36B06F6832574" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ - { name = "A" }, - { name = "ADep" }, - { name = "B" }, + { id = "A", name = "A" }, + { id = "ADep", name = "ADep" }, + { id = "B", name = "B" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "ADep" }, + { id = "ADep", name = "ADep" }, ] [[move.package]] -name = "ADep" +id = "ADep" source = { local = "deps_only/ADep-v1" } [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } dependencies = [ - { name = "ADep" }, + { id = "ADep", 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 9bdc1d2d2e585..31247485a9693 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 @@ -1,39 +1,39 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "E1BD09BE802FCCF437672321DEBFD0C8000F9D4A0AC5E54ED432087ABACA9667" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ - { name = "A" }, - { name = "B" }, - { name = "C" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A-v1" } dependencies = [ - { name = "ADep" }, + { id = "ADep", name = "ADep" }, ] [[move.package]] -name = "ADep" +id = "ADep" source = { local = "deps_only/ADep" } [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } dependencies = [ - { name = "A" }, + { id = "A", name = "A" }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C" } dependencies = [ - { name = "A" }, + { id = "A", name = "A" }, ] 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 31954ffc4c272..57b12d457a03b 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 @@ -1,48 +1,48 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "86DBE490660052E70AF19AEB6DB3CDFE90F770D67E008E12C753575AB346B43C" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ - { name = "A" }, - { name = "B" }, - { name = "E" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, + { id = "E", name = "E" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "C" }, - { name = "D" }, + { id = "C", name = "C" }, + { id = "D", name = "D" }, ] [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } dependencies = [ - { name = "E" }, + { id = "E", name = "E" }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C" } dependencies = [ - { name = "E" }, + { id = "E", name = "E" }, ] [[move.package]] -name = "D" +id = "D" source = { local = "deps_only/D" } dependencies = [ - { name = "E" }, + { id = "E", name = "E" }, ] [[move.package]] -name = "E" +id = "E" source = { local = "deps_only/E-v1" } 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 203629a53228d..d542969613365 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 @@ -1,31 +1,31 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "F64B7E3BA42923C4AFD7490B03D34813BA434044DC83D46F869DD5BB9A6052B2" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ - { name = "A" }, - { name = "B" }, - { name = "C" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C-v1" } 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 e99fb2cf04761..edd0baa8b1384 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 @@ -1,44 +1,44 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "B2F5516D0E0D7FC1D1A91EF42181BC28609979CA8D75F7EF01B473AF22303C1D" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ - { name = "A" }, - { name = "B" }, - { name = "C" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "B" }, + { id = "B", name = "B" }, ] [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B1" } [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C" } dependencies = [ - { name = "D" }, - { name = "E" }, + { id = "D", name = "D" }, + { id = "E", name = "E" }, ] [[move.package]] -name = "D" +id = "D" source = { local = "deps_only/D-v3" } [[move.package]] -name = "E" +id = "E" source = { local = "deps_only/E" } dependencies = [ - { name = "D" }, + { id = "D", name = "D" }, ] 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 ed33e57cb7ba7..25fd4a8e570db 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 @@ -1,49 +1,49 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "88451CA3B87F330C2224714E02829B02787D5AEA4F9CCD9FF239ED0344CF0632" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ - { name = "A" }, - { name = "B" }, - { name = "E" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, + { id = "E", name = "E" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "C" }, - { name = "D" }, - { name = "E" }, + { id = "C", name = "C" }, + { id = "D", name = "D" }, + { id = "E", name = "E" }, ] [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } dependencies = [ - { name = "E" }, + { id = "E", name = "E" }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C" } dependencies = [ - { name = "E" }, + { id = "E", name = "E" }, ] [[move.package]] -name = "D" +id = "D" source = { local = "deps_only/D" } dependencies = [ - { name = "E" }, + { id = "E", name = "E" }, ] [[move.package]] -name = "E" +id = "E" source = { local = "deps_only/E-v1" } 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 50e7097ccae2f..5179dcebc035c 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 @@ -1,30 +1,30 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "2CE4CA7B1785FEAE60C59A993DB1182E09DB665E694C6104DF566E065752C030" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "A", addr_subst = { "AA" = "0000000000000000000000000000000000000000000000000000000000000001" } }, - { name = "B", addr_subst = { "BA" = "0000000000000000000000000000000000000000000000000000000000000001" } }, + { id = "A", name = "A", addr_subst = { "AA" = "0000000000000000000000000000000000000000000000000000000000000001" } }, + { id = "B", name = "B", addr_subst = { "BA" = "0000000000000000000000000000000000000000000000000000000000000001" } }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "C", addr_subst = { "AA" = "A" } }, + { id = "C", name = "C", addr_subst = { "AA" = "A" } }, ] [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } dependencies = [ - { name = "C", addr_subst = { "BA" = "A" } }, + { id = "C", name = "C", addr_subst = { "BA" = "A" } }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C" } 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 13413683eb260..26bf01775d595 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 @@ -1,30 +1,30 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "373B3598A66D05FBD7DE398D2F588C9C79C9F38757140E8717C1D851CBC5C15F" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "A" }, - { name = "B" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } dependencies = [ - { name = "A" }, + { id = "A", name = "A" }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C" } 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 07bcc6f99d159..373727b9d0aa3 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 @@ -1,21 +1,21 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "8D09D19521F36950C0698F14ED09FE4F6175C022796F1E401F2F5A1BCA6FCE98" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ - { name = "A" }, + { id = "A", name = "A" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "ADep" }, + { id = "ADep", name = "ADep" }, ] [[move.package]] -name = "ADep" +id = "ADep" source = { local = "deps_only/ADep" } 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 78482d3c9158d..09d6521d4f134 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 @@ -1,21 +1,21 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "725168ABE1A1677C13C020BCA80D7C059B53A9C7E2E4D15FD0BE671E0D2A87B0" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ - { name = "A" }, + { id = "A", name = "A" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "ADep" }, + { id = "ADep", name = "ADep" }, ] [[move.package]] -name = "ADep" +id = "ADep" source = { local = "deps_only/ADep" } 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 f685ef0302c09..06b17afa4d975 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 @@ -1,36 +1,36 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "84A0B503BE9F9B341AC66860713D12704876E5C2425891E3B94626B12E4313E5" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "A" }, + { id = "A", name = "A" }, ] dev-dependencies = [ - { name = "B" }, + { id = "B", name = "B" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "ADep" }, + { id = "ADep", name = "ADep" }, ] [[move.package]] -name = "ADep" +id = "ADep" source = { local = "deps_only/ADep" } [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } dependencies = [ - { name = "BDep" }, + { id = "BDep", name = "BDep" }, ] [[move.package]] -name = "BDep" +id = "BDep" source = { local = "deps_only/BDep" } 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 38a5db2e8deb2..a211a1698f932 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 @@ -1,22 +1,22 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "2401A97D2FE979752E0726963BFC3F677A4FA8041F3C6FAE5A4302401B165463" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "A" }, - { name = "ADep" }, + { id = "A", name = "A" }, + { id = "ADep", name = "ADep" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "ADep" }, + { id = "ADep", name = "ADep" }, ] [[move.package]] -name = "ADep" +id = "ADep" source = { local = "deps_only/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 22d98b6190511..c4c7255887a97 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 @@ -1,21 +1,21 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "C5119AF40DAACF1DF25E8E9DE830EC0EA839A29E62D7081BF217B49B10BD6980" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ - { name = "A" }, + { id = "A", name = "A" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "ADep" }, + { id = "ADep", name = "ADep" }, ] [[move.package]] -name = "ADep" +id = "ADep" source = { local = "deps_only/ADep" } 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 cdcc66f3955b9..6223fbab28b6c 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 @@ -1,18 +1,18 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "846084292F5A72B3CFE28402E76C1F3F172C3001C90FAAC19221D4B178A84EDB" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "C" }, - { name = "D" }, + { id = "C", name = "C" }, + { id = "D", name = "D" }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C" } [[move.package]] -name = "D" +id = "D" source = { local = "deps_only/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 76f59370ce000..ab8df643e9c29 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 @@ -1,21 +1,21 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "598DCC919F7378E59F328E1B448D1AAC70B8F34894146860B3ABF46600F9F79B" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ - { name = "MoveNursery" }, + { id = "MoveNursery", name = "MoveNursery" }, ] [[move.package]] -name = "MoveNursery" +id = "MoveNursery" source = { git = "https://github.com/MystenLabs/sui", rev = "5d8a867", subdir = "external-crates/move/crates/move-stdlib/nursery" } dependencies = [ - { name = "MoveStdlib" }, + { id = "MoveStdlib", name = "MoveStdlib" }, ] [[move.package]] -name = "MoveStdlib" +id = "MoveStdlib" source = { git = "https://github.com/MystenLabs/sui", rev = "5d8a867", subdir = "external-crates/move/crates/move-stdlib" } 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 2690dab64732b..c3513005b31ff 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 @@ -1,21 +1,21 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "CD8925BBAAE2A64C347B3D48466097B55E04876C226546516D83EDC58C0BBB3A" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ - { name = "Nested" }, + { id = "Nested", name = "Nested" }, ] [[move.package]] -name = "More" +id = "More" source = { local = "deps_only/nested/more" } [[move.package]] -name = "Nested" +id = "Nested" source = { local = "deps_only/nested" } dependencies = [ - { name = "More" }, + { id = "More", name = "More" }, ] 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 2690dab64732b..c3513005b31ff 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 @@ -1,21 +1,21 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "CD8925BBAAE2A64C347B3D48466097B55E04876C226546516D83EDC58C0BBB3A" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ - { name = "Nested" }, + { id = "Nested", name = "Nested" }, ] [[move.package]] -name = "More" +id = "More" source = { local = "deps_only/nested/more" } [[move.package]] -name = "Nested" +id = "Nested" source = { local = "deps_only/nested" } dependencies = [ - { name = "More" }, + { id = "More", name = "More" }, ] 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 e9a3c5e449a44..f6e88c848912d 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 @@ -1,32 +1,32 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "5005BF461ECC5281FE314371B38D8C163C5395D7455B91BEA0F63C1BCFD57551" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ - { name = "More" }, - { name = "Nested" }, - { name = "Shared" }, + { id = "More", name = "More" }, + { id = "Nested", name = "Nested" }, + { id = "Shared", name = "Shared" }, ] [[move.package]] -name = "More" +id = "More" source = { local = "deps_only/more" } dependencies = [ - { name = "Shared" }, + { id = "Shared", name = "Shared" }, ] [[move.package]] -name = "Nested" +id = "Nested" source = { local = "deps_only/nested" } dependencies = [ - { name = "More" }, - { name = "Shared" }, + { id = "More", name = "More" }, + { id = "Shared", name = "Shared" }, ] [[move.package]] -name = "Shared" +id = "Shared" source = { local = "deps_only/shared" } 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 8bc86b54e5795..ba3039f5d0028 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 @@ -1,13 +1,13 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "0C66C2C067539518C3189E86B5A09D478C872C0F97ACE6D707AE9753319E56AA" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ - { name = "OtherDep", addr_subst = { "A" = "B" } }, + { id = "OtherDep", name = "OtherDep", addr_subst = { "A" = "B" } }, ] [[move.package]] -name = "OtherDep" +id = "OtherDep" source = { local = "deps_only/other_dep" } 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 37b2fbd46b2db..c1ac6f7f30305 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 @@ -1,13 +1,13 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "9DE3FDE63E3A9E1827A3D28769FE454A274BEF7DC0514AEEA9076DE876F2C361" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ - { name = "OtherDep", digest = "BAD_DIGEST", addr_subst = { "A" = "B" } }, + { id = "OtherDep", name = "OtherDep", digest = "BAD_DIGEST", addr_subst = { "A" = "B" } }, ] [[move.package]] -name = "OtherDep" +id = "OtherDep" source = { local = "deps_only/other_dep" } 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 650bc797bd2b4..e329435a00d5f 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 @@ -1,13 +1,13 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "340302CAC58F9844D483E9F19F08D9578B90043E621D953A62A4B679F8D98896" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ - { name = "OtherDep", addr_subst = { "A" = "B" } }, + { id = "OtherDep", name = "OtherDep", addr_subst = { "A" = "B" } }, ] [[move.package]] -name = "OtherDep" +id = "OtherDep" source = { local = "deps_only/other_dep" } 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 f8ea0a78c8aec..27cec68c7eb98 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 @@ -1,30 +1,30 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "6F18190939664D7ECC8F2DC327E079037A743E0CFF3FA5F72DABD2B6B5C3D200" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "A-resolved", addr_subst = { "AA" = "0000000000000000000000000000000000000000000000000000000000000001" } }, - { name = "B-resolved", addr_subst = { "BA" = "0000000000000000000000000000000000000000000000000000000000000001" } }, + { id = "A-resolved", name = "A-rename", addr_subst = { "AA" = "0000000000000000000000000000000000000000000000000000000000000001" } }, + { id = "B-resolved", name = "B-rename", addr_subst = { "BA" = "0000000000000000000000000000000000000000000000000000000000000001" } }, ] [[move.package]] -name = "A-resolved" +id = "A-resolved" source = { local = "deps_only/A-rename" } dependencies = [ - { name = "C-resolved", addr_subst = { "AA" = "A" } }, + { id = "C-resolved", name = "C-rename", addr_subst = { "AA" = "A" } }, ] [[move.package]] -name = "B-resolved" +id = "B-resolved" source = { local = "deps_only/B-rename" } dependencies = [ - { name = "C-resolved", addr_subst = { "BA" = "A" } }, + { id = "C-resolved", name = "C-rename", addr_subst = { "BA" = "A" } }, ] [[move.package]] -name = "C-resolved" +id = "C-resolved" source = { local = "deps_only/C-rename" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move.resolved index 220e2bdd225d8..186e1fe117832 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move.resolved +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move.resolved @@ -1,5 +1,5 @@ -When resolving dependencies for package Root-rename, conflicting versions of package C-resolved found: -At A-rename -> C-resolved - C-resolved = { local = "deps_only/C-rename-v2" } -At B -> C-resolved - C-resolved = { local = "deps_only/C-rename-v1" } +When resolving dependencies for package Root-rename, conflicting versions of package C-rename found: +At A-rename -> C-rename + C-rename = { local = "deps_only/C-rename-v2" } +At B -> C-rename + C-rename = { local = "deps_only/C-rename-v1" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/A-rename/Move.lock b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/A-rename/Move.lock index 5a92bc29440cf..b6825dd9ea91a 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/A-rename/Move.lock +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/A-rename/Move.lock @@ -1,14 +1,14 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 0 +version = 3 manifest_digest = "EB5AB2DFC86E6D3D2FE98D626C2162A4C7344F2A3C485FE58DD6C339CD5E73CF" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ - { name = "C-resolved" }, + { id = "C-resolved", name = "C-rename" }, ] [[move.package]] -name = "C-resolved" +id = "C-resolved" source = { local = "../C-rename-v2" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/B/Move.lock b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/B/Move.lock index f7ebf2752eb21..538dda6f5aaf0 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/B/Move.lock +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/B/Move.lock @@ -1,14 +1,14 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 0 +version = 3 manifest_digest = "9C1FF13CFBAECFDB6402A2E0952FDA85BE3719E6D1FD0682D63A6CD7A8E92ED6" deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ - { name = "C-resolved" }, + { id = "C-resolved", name = "C-rename" }, ] [[move.package]] -name = "C-resolved" +id = "C-resolved" source = { local = "../C-rename-v1" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/C-rename-v1/Move.lock b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/C-rename-v1/Move.lock index d255a73a57e76..00fbe255cd9d8 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/C-rename-v1/Move.lock +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/C-rename-v1/Move.lock @@ -1,6 +1,6 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 0 +version = 3 manifest_digest = "60A5B7F88A83F5697F7B9AC059CB9680BD351F68B8EB80AFA13294BBB97A47C3" deps_digest = "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855" diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/C-rename-v2/Move.lock b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/C-rename-v2/Move.lock index d255a73a57e76..00fbe255cd9d8 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/C-rename-v2/Move.lock +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/deps_only/C-rename-v2/Move.lock @@ -1,6 +1,6 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 0 +version = 3 manifest_digest = "60A5B7F88A83F5697F7B9AC059CB9680BD351F68B8EB80AFA13294BBB97A47C3" deps_digest = "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855" diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move.resolved index 1c17de6f22aa6..b8a0ddf42ba03 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move.resolved +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move.resolved @@ -2,4 +2,4 @@ When resolving dependencies for package Root-rename, conflicting dependencies fo At B -> A ADep-rename = { local = "deps_only/ADep", addr_subst = { "A" = "0000000000000000000000000000000000000000000000000000000000000007" } } At C -> A - ADep-resolved = { local = "deps_only/ADep", addr_subst = { "A" = "0000000000000000000000000000000000000000000000000000000000000042" } } + ADep-rename = { local = "deps_only/ADep", addr_subst = { "A" = "0000000000000000000000000000000000000000000000000000000000000042" } } 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 28ba915ae54bd..ab2fe9145134c 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 @@ -1,20 +1,20 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "A152DBB11C386226B7A6435D66090103E0CC19330A38251784E4D2D0C0EF57A5" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "A" }, - { name = "B" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } version = "3" [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } version = "2" 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 ae74581c8ef7e..e61df4416c488 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 @@ -1,33 +1,33 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "88C81CA573217383E355274A37F0C6171DDE43ED835A166B0D6446C294788F65" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "A" }, - { name = "B" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } version = "3" dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } version = "1" dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C-loc-1" } version = "2" 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 e77832cd7c792..73515ac3ee7ce 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 @@ -1,41 +1,41 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "66CAE9439801A11D189DACA1182DFEF8BF0CA1C5F043F966D466CD7E7C486FB3" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "A" }, - { name = "B" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } version = "3" dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } version = "1" dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C-loc-1" } version = "2" dependencies = [ - { name = "D" }, + { id = "D", name = "D" }, ] [[move.package]] -name = "D" +id = "D" source = { local = "deps_only/D" } 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 04acf0e2f1e7e..e77112522509b 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 @@ -1,42 +1,42 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "E301B66162FDBFF21CE0504F64D66F3F9CFE1FC85B6675A3D91C417A41284EEA" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "A" }, - { name = "B" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } version = "3" dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } version = "1" dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C-loc-1" } version = "2" dependencies = [ - { name = "D" }, + { id = "D", name = "D" }, ] [[move.package]] -name = "D" +id = "D" source = { local = "deps_only/D-loc-1" } version = "1" 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 18aab8973149a..09483a7544b48 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 @@ -1,31 +1,31 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "99C31161E1ED00C7621A2403D3513580715CA556C77C3C26FB1233B0778291AF" deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ - { name = "A" }, - { name = "B" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } dependencies = [ - { name = "ADep" }, + { id = "ADep", name = "ADep" }, ] [[move.package]] -name = "ADep" +id = "ADep" source = { local = "deps_only/ADep" } version = "4" [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } dependencies = [ - { name = "ADep" }, + { id = "ADep", name = "ADep" }, ] 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 daf35021ea5a1..8bc3a232b1c63 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 @@ -1,34 +1,34 @@ # @generated by Move, please check-in and do not edit manually. [move] -version = 2 +version = 3 manifest_digest = "84867C472017C20EFC5FF536C440568833A0F592C104B9F9EF5CD5A27D109CDB" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ - { name = "A" }, - { name = "B" }, - { name = "C" }, + { id = "A", name = "A" }, + { id = "B", name = "B" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "A" +id = "A" source = { local = "deps_only/A" } version = "3" dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "B" +id = "B" source = { local = "deps_only/B" } version = "1" dependencies = [ - { name = "C" }, + { id = "C", name = "C" }, ] [[move.package]] -name = "C" +id = "C" source = { local = "deps_only/C-loc-2" } version = "2" diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolvers/silent.sh b/external-crates/move/crates/move-package/tests/test_sources/resolvers/silent.sh index 69616a2cbe024..9ea4d24446d12 100755 --- a/external-crates/move/crates/move-package/tests/test_sources/resolvers/silent.sh +++ b/external-crates/move/crates/move-package/tests/test_sources/resolvers/silent.sh @@ -9,21 +9,21 @@ PACKAGE="$2" # Print lock file cat <