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 feb231473eaff..12db840d7fff7 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 @@ -215,6 +215,7 @@ async fn test_generate_lock_file() { [move] version = 0 manifest_digest = "1401DE1C3C3FF6D20EB27741A0A7B5D61E34836CB6C90ECC2F2DE97C47B4D0F9" + deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ { name = "Examples" }, diff --git a/external-crates/move/Cargo.lock b/external-crates/move/Cargo.lock index 7a02965212cde..98b4a1e7e5aed 100644 --- a/external-crates/move/Cargo.lock +++ b/external-crates/move/Cargo.lock @@ -824,6 +824,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "concurrent-queue" version = "2.1.0" @@ -2596,6 +2606,7 @@ dependencies = [ "read-write-set", "serde_yaml", "tempfile", + "toml_edit 0.14.4", "walkdir", ] @@ -3878,7 +3889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.8", ] [[package]] @@ -5016,6 +5027,18 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +[[package]] +name = "toml_edit" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f" +dependencies = [ + "combine", + "indexmap", + "itertools", + "serde", +] + [[package]] name = "toml_edit" version = "0.19.8" diff --git a/external-crates/move/tools/move-package/src/lib.rs b/external-crates/move/tools/move-package/src/lib.rs index 2d20ee5c55f0c..677012ca28046 100644 --- a/external-crates/move/tools/move-package/src/lib.rs +++ b/external-crates/move/tools/move-package/src/lib.rs @@ -163,17 +163,21 @@ impl BuildConfig { let lock_string = std::fs::read_to_string(path.join(SourcePackageLayout::Lock.path())).ok(); let _mutx = PackageLock::lock(); // held until function returns - let mut dep_graph_builder = - DependencyGraphBuilder::new(self.skip_fetch_latest_git_deps, writer); + let install_dir = self.install_dir.as_ref().unwrap_or(&path).to_owned(); + + let mut dep_graph_builder = DependencyGraphBuilder::new( + self.skip_fetch_latest_git_deps, + writer, + install_dir.clone(), + ); let (dependency_graph, modified) = dep_graph_builder.get_graph( &DependencyKind::default(), - path.clone(), + path, manifest_string, lock_string, )?; if modified { - let install_dir = self.install_dir.as_ref().unwrap_or(&path).to_owned(); let lock = dependency_graph.write_to_lock(install_dir)?; if let Some(lock_path) = &self.lock_file { lock.commit(lock_path)?; diff --git a/external-crates/move/tools/move-package/src/lock_file/mod.rs b/external-crates/move/tools/move-package/src/lock_file/mod.rs index 820d0af7ec953..6277d9c99d3db 100644 --- a/external-crates/move/tools/move-package/src/lock_file/mod.rs +++ b/external-crates/move/tools/move-package/src/lock_file/mod.rs @@ -38,8 +38,8 @@ impl LockFile { /// of a move package). pub fn new( install_dir: PathBuf, - manifest_digest: Option, - deps_digest: Option, + manifest_digest: String, + deps_digest: String, ) -> Result { let mut locks_dir = install_dir; locks_dir.extend([ diff --git a/external-crates/move/tools/move-package/src/lock_file/schema.rs b/external-crates/move/tools/move-package/src/lock_file/schema.rs index 0d3bc5c14dae1..760ee673ceb46 100644 --- a/external-crates/move/tools/move-package/src/lock_file/schema.rs +++ b/external-crates/move/tools/move-package/src/lock_file/schema.rs @@ -63,13 +63,14 @@ pub struct Dependency { #[derive(Serialize, Deserialize)] pub struct Header { pub version: u64, - /// A hash of the manifest file content this lock file was generated from (if any) computed - /// using SHA-256 hashing algorithm. - pub manifest_digest: Option, - /// A hash of all the dependencies (their lock file content) this lock file depends on (if any), - /// computed by first hashing all lock files using SHA-256 hashing algorithm and then combining - /// them into a single digest using SHA-256 hasher (similarly to the package digest is computed) - pub deps_digest: Option, + /// A hash of the manifest file content this lock file was generated from computed using SHA-256 + /// hashing algorithm. + pub manifest_digest: String, + /// A hash of all the dependencies (their lock file content) this lock file depends on, computed + /// by first hashing all lock files using SHA-256 hashing algorithm and then combining them into + /// a single digest using SHA-256 hasher (similarly to the package digest is computed). If there + /// are no dependencies, it's an empty string. + pub deps_digest: String, } #[derive(Serialize, Deserialize)] @@ -115,8 +116,8 @@ pub fn read_header(contents: &String) -> Result
{ /// Write the initial part of the lock file. pub(crate) fn write_prologue( file: &mut NamedTempFile, - manifest_digest: Option, - deps_digest: Option, + manifest_digest: String, + deps_digest: String, ) -> Result<()> { writeln!( file, diff --git a/external-crates/move/tools/move-package/src/resolution/dependency_graph.rs b/external-crates/move/tools/move-package/src/resolution/dependency_graph.rs index 6ba43a088133e..62a6e1659ee56 100644 --- a/external-crates/move/tools/move-package/src/resolution/dependency_graph.rs +++ b/external-crates/move/tools/move-package/src/resolution/dependency_graph.rs @@ -79,10 +79,10 @@ pub struct DependencyGraph { /// `DependencyMode::Always` edges in `package_graph`). pub always_deps: BTreeSet, - /// A hash of the manifest file content this lock file was generated from, if any. - pub manifest_digest: Option, - /// A hash of all the dependencies (their lock file content) this lock file depends on, if any. - pub deps_digest: Option, + /// A hash of the manifest file content this lock file was generated from. + pub manifest_digest: String, + /// A hash of all the dependencies (their lock file content) this lock file depends on. + pub deps_digest: String, } /// A helper to store additional information about a dependency graph @@ -163,88 +163,52 @@ pub struct DependencyGraphBuilder { pub progress_output: Progress, /// A chain of visited dependencies used for cycle detection visited_dependencies: VecDeque<(PM::PackageName, PM::InternalDependency)>, + /// Installation directory for compiled artifacts (from BuildConfig). + install_dir: PathBuf, } impl DependencyGraphBuilder { - pub fn new(skip_fetch_latest_git_deps: bool, progress_output: Progress) -> Self { + pub fn new( + skip_fetch_latest_git_deps: bool, + progress_output: Progress, + install_dir: PathBuf, + ) -> Self { DependencyGraphBuilder { dependency_cache: DependencyCache::new(skip_fetch_latest_git_deps), progress_output, visited_dependencies: VecDeque::new(), + install_dir, } } - /// Get a graph from the Move.lock file, if Move.lock file is present and up-to-date - /// (additionally returning false), otherwise compute a new graph based on the content of the - /// Move.toml (manifest) file (additionally returning true). + /// Get a new graph by either reading it from Move.lock file (if this file is up-to-date, in + /// which case also return false) or by computing a new graph based on the content of the + /// Move.toml (manifest) file (in which case also return true). pub fn get_graph( &mut self, parent: &PM::DependencyKind, root_path: PathBuf, manifest_string: String, - lock_string: Option, + lock_string_opt: Option, ) -> Result<(DependencyGraph, bool)> { let toml_manifest = parse_move_manifest_string(manifest_string.clone())?; - let manifest = parse_source_manifest(toml_manifest)?; + let root_manifest = parse_source_manifest(toml_manifest)?; // compute digests eagerly as even if we can't reuse existing lock file, they need to become // part of the newly computed dependency graph - let new_manifest_digest_opt = Some(digest_str(manifest_string.into_bytes().as_slice())); - - let new_deps_digest_opt = self.dependency_digest(root_path.clone(), &manifest)?; - if let Some(lock_contents) = lock_string { - let schema::Header { - version: _, - manifest_digest: manifest_digest_opt, - deps_digest: deps_digest_opt, - } = schema::read_header(&lock_contents)?; - - // check if manifest file and dependencies haven't changed and we can use existing lock - // file to create the dependency graph - if new_manifest_digest_opt == manifest_digest_opt { - // manifest file hasn't changed - if let Some(deps_digest) = deps_digest_opt { - // dependencies digest exists in the lock file - if Some(deps_digest) == new_deps_digest_opt { - // dependencies have not changed - return Ok(( - DependencyGraph::read_from_lock( - root_path, - manifest.package.name, - &mut lock_contents.as_bytes(), - None, - )?, - false, - )); - } - } - } - } - - Ok(( - self.new_graph( - parent, - &manifest, - root_path, - new_manifest_digest_opt, - new_deps_digest_opt, - )?, - true, - )) - } + let new_manifest_digest = digest_str(manifest_string.into_bytes().as_slice()); + let (old_manifest_digest_opt, old_deps_digest_opt, lock_string) = match lock_string_opt { + Some(lock_string) => match schema::read_header(&lock_string) { + Ok(header) => ( + Some(header.manifest_digest), + Some(header.deps_digest), + Some(lock_string), + ), + Err(_) => (None, None, None), // malformed header - regenerate lock file + }, + None => (None, None, None), + }; - /// Build a graph from the transitive dependencies and dev-dependencies of `root_package`. - /// - /// `progress_output` is an output stream that is written to while generating the graph, to - /// provide human-readable progress updates. - pub fn new_graph( - &mut self, - parent: &PM::DependencyKind, - root_manifest: &PM::SourceManifest, - root_path: PathBuf, - manifest_digest: Option, - deps_digest: Option, - ) -> Result { // collect sub-graphs for "regular" and "dev" dependencies let mut dep_graphs = self.collect_graphs( parent, @@ -253,6 +217,10 @@ impl DependencyGraphBuilder { DependencyMode::Always, &root_manifest.dependencies, )?; + let dep_lock_files = dep_graphs + .values() + .map(|graph_info| graph_info.g.write_to_lock(self.install_dir.clone())) + .collect::>>()?; let dev_dep_graphs = self.collect_graphs( parent, root_manifest.package.name, @@ -261,6 +229,30 @@ impl DependencyGraphBuilder { &root_manifest.dev_dependencies, )?; + let dev_dep_lock_files = dev_dep_graphs + .values() + .map(|graph_info| graph_info.g.write_to_lock(self.install_dir.clone())) + .collect::>>()?; + let new_deps_digest = self.dependency_digest(dep_lock_files, dev_dep_lock_files)?; + let (manifest_digest, deps_digest) = + match (old_manifest_digest_opt, old_deps_digest_opt, lock_string) { + (Some(old_manifest_digest), Some(old_deps_digest), Some(lock_string)) + if old_manifest_digest == new_manifest_digest + && old_deps_digest == new_deps_digest => + { + return Ok(( + DependencyGraph::read_from_lock( + root_path, + root_manifest.package.name, + &mut lock_string.as_bytes(), // safe since old_deps_digest exists + None, + )?, + false, + )); + } + _ => (new_manifest_digest, new_deps_digest), + }; + dep_graphs.extend(dev_dep_graphs); let mut combined_graph = DependencyGraph { @@ -309,7 +301,7 @@ impl DependencyGraphBuilder { combined_graph.check_acyclic()?; combined_graph.discover_always_deps(); - Ok(combined_graph) + Ok((combined_graph, true)) } /// Given all dependencies from the parent manifest file, collects all the sub-graphs @@ -405,66 +397,33 @@ impl DependencyGraphBuilder { Ok((pkg_graph, is_override, is_external)) } - /// Computes dependency hashes but may return None if information about some dependencies is not - /// available or if there are no dependencies. - fn dependency_hashes( - &mut self, - root_path: PathBuf, - dependencies: &PM::Dependencies, - ) -> Result>> { + /// Computes dependency hashes. + fn dependency_hashes(&mut self, lock_files: Vec) -> Result> { let mut hashed_lock_files = Vec::new(); - - for (pkg_name, dep) in dependencies { - let internal_dep = match dep { - // bail if encountering external dependency that would require running the external - // resolver - // TODO: should we consider handling this here? - PM::Dependency::External(_) => return Ok(None), - PM::Dependency::Internal(d) => d, - }; - - self.dependency_cache - .download_and_update_if_remote( - *pkg_name, - &internal_dep.kind, - &mut self.progress_output, - ) - .with_context(|| format!("Fetching '{}'", *pkg_name))?; - let pkg_path = root_path.join(local_path(&internal_dep.kind)); - - let Ok(lock_contents) = std::fs::read_to_string(pkg_path.join(SourcePackageLayout::Lock.path())) else { - return Ok(None); - }; - hashed_lock_files.push(digest_str(lock_contents.as_bytes())); + for mut lock_file in lock_files { + let mut lock_string: String = "".to_string(); + lock_file.read_to_string(&mut lock_string)?; + hashed_lock_files.push(digest_str(lock_string.as_bytes())); } - - Ok(if hashed_lock_files.is_empty() { - None - } else { - Some(hashed_lock_files) - }) + Ok(hashed_lock_files) } - /// Computes a digest of all dependencies in a manifest file but may return None if information - /// about some dependencies is not available. + /// Computes a digest of all dependencies in a manifest file (or digest of empty list if there + /// are no dependencies). fn dependency_digest( &mut self, - root_path: PathBuf, - manifest: &PM::SourceManifest, - ) -> Result> { - let mut dep_hashes = self - .dependency_hashes(root_path.clone(), &manifest.dependencies)? - .unwrap_or_default(); - - let dev_dep_hashes = self - .dependency_hashes(root_path, &manifest.dev_dependencies)? - .unwrap_or_default(); - - if dep_hashes.is_empty() { - Ok(None) + dep_lock_files: Vec, + dev_dep_lock_files: Vec, + ) -> Result { + let mut dep_hashes = self.dependency_hashes(dep_lock_files)?; + + let dev_dep_hashes = self.dependency_hashes(dev_dep_lock_files)?; + + if dep_hashes.is_empty() && dev_dep_hashes.is_empty() { + Ok(digest_str(&[])) } else { dep_hashes.extend(dev_dep_hashes); - Ok(Some(hashed_files_digest(dep_hashes))) + Ok(hashed_files_digest(dep_hashes)) } } } diff --git a/external-crates/move/tools/move-package/src/resolution/mod.rs b/external-crates/move/tools/move-package/src/resolution/mod.rs index cda770c725da8..d858c52f1313f 100644 --- a/external-crates/move/tools/move-package/src/resolution/mod.rs +++ b/external-crates/move/tools/move-package/src/resolution/mod.rs @@ -29,8 +29,16 @@ pub fn download_dependency_repos( root_path: &Path, progress_output: &mut Progress, ) -> Result<()> { - let mut dep_graph_builder = - DependencyGraphBuilder::new(build_options.skip_fetch_latest_git_deps, progress_output); + let install_dir = build_options + .install_dir + .as_ref() + .unwrap_or(&root_path.to_path_buf()) + .to_owned(); + let mut dep_graph_builder = DependencyGraphBuilder::new( + build_options.skip_fetch_latest_git_deps, + progress_output, + install_dir, + ); let (graph, _) = dep_graph_builder.get_graph( &DependencyKind::default(), root_path.to_path_buf(), diff --git a/external-crates/move/tools/move-package/tests/test_additional_addresses.rs b/external-crates/move/tools/move-package/tests/test_additional_addresses.rs index abcfd89bc8e69..7a611c956dbf2 100644 --- a/external-crates/move/tools/move-package/tests/test_additional_addresses.rs +++ b/external-crates/move/tools/move-package/tests/test_additional_addresses.rs @@ -5,7 +5,7 @@ use move_core_types::account_address::AccountAddress; use move_package::{ resolution::{dependency_graph as DG, resolution_graph as RG}, - source_package::{manifest_parser as MP, parsed_manifest as PM}, + source_package::{layout::SourcePackageLayout, parsed_manifest as PM}, BuildConfig, }; use std::{collections::BTreeMap, path::PathBuf}; @@ -21,19 +21,20 @@ fn test_additonal_addresses() { .into_iter() .collect(); - let pm = MP::parse_move_manifest_from_file(&path).unwrap(); + let manifest_string = + std::fs::read_to_string(&path.join(SourcePackageLayout::Manifest.path())).unwrap(); let mut dep_graph_builder = DG::DependencyGraphBuilder::new( /* skip_fetch_latest_git_deps */ true, std::io::sink(), + tempdir().unwrap().path().to_path_buf(), ); - let dg = dep_graph_builder - .new_graph( + let (dg, _) = dep_graph_builder + .get_graph( &PM::DependencyKind::default(), - &pm, path, - /* manifest_digest */ None, - /* deps_digest */ None, + manifest_string, + /* lock_string_opt */ None, ) .unwrap(); @@ -76,19 +77,20 @@ fn test_additonal_addresses_already_assigned_same_value() { .into_iter() .collect(); - let pm = MP::parse_move_manifest_from_file(&path).unwrap(); + let manifest_string = + std::fs::read_to_string(&path.join(SourcePackageLayout::Manifest.path())).unwrap(); let mut dep_graph_builder = DG::DependencyGraphBuilder::new( /* skip_fetch_latest_git_deps */ true, std::io::sink(), + tempdir().unwrap().path().to_path_buf(), ); - let dg = dep_graph_builder - .new_graph( + let (dg, _) = dep_graph_builder + .get_graph( &PM::DependencyKind::default(), - &pm, path, - /* manifest_digest */ None, - /* deps_digest */ None, + manifest_string, + /* lock_string_opt */ None, ) .unwrap(); @@ -120,19 +122,20 @@ fn test_additonal_addresses_already_assigned_different_value() { .into_iter() .collect(); - let pm = MP::parse_move_manifest_from_file(&path).unwrap(); + let manifest_string = + std::fs::read_to_string(&path.join(SourcePackageLayout::Manifest.path())).unwrap(); let mut dep_graph_builder = DG::DependencyGraphBuilder::new( /* skip_fetch_latest_git_deps */ true, std::io::sink(), + tempdir().unwrap().path().to_path_buf(), ); - let dg = dep_graph_builder - .new_graph( + let (dg, _) = dep_graph_builder + .get_graph( &PM::DependencyKind::default(), - &pm, path, - /* manifest_digest */ None, - /* deps_digest */ None, + manifest_string, + /* lock_string_opt */ None, ) .unwrap(); diff --git a/external-crates/move/tools/move-package/tests/test_dependency_graph.rs b/external-crates/move/tools/move-package/tests/test_dependency_graph.rs index 6aff91a4e1e24..5846bad3a953a 100644 --- a/external-crates/move/tools/move-package/tests/test_dependency_graph.rs +++ b/external-crates/move/tools/move-package/tests/test_dependency_graph.rs @@ -14,7 +14,7 @@ use move_package::{ DependencyGraph, DependencyGraphBuilder, DependencyGraphInfo, DependencyMode, }, source_package::{ - manifest_parser::parse_move_manifest_from_file, + layout::SourcePackageLayout, parsed_manifest::{Dependency, DependencyKind, InternalDependency}, }, }; @@ -32,16 +32,19 @@ macro_rules! assert_error_contains { fn no_dep_graph() { let pkg = no_dep_test_package(); - let manifest = parse_move_manifest_from_file(&pkg).expect("Loading manifest"); - let mut dep_graph_builder = - DependencyGraphBuilder::new(/* skip_fetch_latest_git_deps */ true, std::io::sink()); - let graph = dep_graph_builder - .new_graph( + let manifest_string = std::fs::read_to_string(&pkg.join(SourcePackageLayout::Manifest.path())) + .expect("Loading manifest"); + let mut dep_graph_builder = DependencyGraphBuilder::new( + /* skip_fetch_latest_git_deps */ true, + std::io::sink(), + tempfile::tempdir().unwrap().path().to_path_buf(), + ); + let (graph, _) = dep_graph_builder + .get_graph( &DependencyKind::default(), - &manifest, pkg, - /* manifest_digest */ None, - /* deps_digest */ None, + manifest_string, + /* lock_string_opt */ None, ) .expect("Creating DependencyGraph"); @@ -111,7 +114,12 @@ fn lock_file_missing_dependency() { let pkg = one_dep_test_package(); let commit = tmp.path().join("Move.lock"); - let lock = LockFile::new(pkg.clone(), None, None).expect("Creating new lock file"); + let lock = LockFile::new( + pkg.clone(), + /* manifest_digest */ "42".to_string(), + /* deps_digest */ "7".to_string(), + ) + .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(); @@ -137,16 +145,19 @@ fn lock_file_missing_dependency() { fn always_deps() { let pkg = dev_dep_test_package(); - let manifest = parse_move_manifest_from_file(&pkg).expect("Loading manifest"); - let mut dep_graph_builder = - DependencyGraphBuilder::new(/* skip_fetch_latest_git_deps */ true, std::io::sink()); - let graph = dep_graph_builder - .new_graph( + let manifest_string = std::fs::read_to_string(&pkg.join(SourcePackageLayout::Manifest.path())) + .expect("Loading manifest"); + let mut dep_graph_builder = DependencyGraphBuilder::new( + /* skip_fetch_latest_git_deps */ true, + std::io::sink(), + tempfile::tempdir().unwrap().path().to_path_buf(), + ); + let (graph, _) = dep_graph_builder + .get_graph( &DependencyKind::default(), - &manifest, pkg, - /* manifest_digest */ None, - /* deps_digest */ None, + manifest_string, + /* lock_string_opt */ None, ) .expect("Creating DependencyGraph"); @@ -498,16 +509,19 @@ fn merge_overlapping_different_deps() { fn immediate_dependencies() { let pkg = dev_dep_test_package(); - let manifest = parse_move_manifest_from_file(&pkg).expect("Loading manifest"); - let mut dep_graph_builder = - DependencyGraphBuilder::new(/* skip_fetch_latest_git_deps */ true, std::io::sink()); - let graph = dep_graph_builder - .new_graph( + let manifest_string = std::fs::read_to_string(&pkg.join(SourcePackageLayout::Manifest.path())) + .expect("Loading manifest"); + let mut dep_graph_builder = DependencyGraphBuilder::new( + /* skip_fetch_latest_git_deps */ true, + std::io::sink(), + tempfile::tempdir().unwrap().path().to_path_buf(), + ); + let (graph, _) = dep_graph_builder + .get_graph( &DependencyKind::default(), - &manifest, pkg, - /* manifest_digest */ None, - /* deps_digest */ None, + manifest_string, + /* lock_string_opt */ None, ) .expect("Creating DependencyGraph"); @@ -558,11 +572,15 @@ fn dev_dep_test_package() -> PathBuf { const EMPTY_LOCK: &str = r#" [move] version = 0 +manifest_digest = "42" +deps_digest = "" "#; const A_LOCK: &str = r#" [move] version = 0 +manifest_digest = "42" +deps_digest = "7" dependencies = [ { name = "A" }, ] @@ -575,6 +593,8 @@ source = { local = "./A" } const AB_LOCK: &str = r#" [move] version = 0 +manifest_digest = "42" +deps_digest = "7" dependencies = [ { name = "A" }, { name = "B" }, @@ -592,6 +612,8 @@ source = { local = "./B" } const A_DEP_B_LOCK: &str = r#" [move] version = 0 +manifest_digest = "42" +deps_digest = "7" dependencies = [ { name = "A" }, ] diff --git a/external-crates/move/tools/move-package/tests/test_lock_file.rs b/external-crates/move/tools/move-package/tests/test_lock_file.rs index bf66da83b25d4..169371dc5555a 100644 --- a/external-crates/move/tools/move-package/tests/test_lock_file.rs +++ b/external-crates/move/tools/move-package/tests/test_lock_file.rs @@ -16,7 +16,12 @@ fn commit() { let lock_path = pkg.path().join("Move.lock"); { - let mut lock = LockFile::new(pkg.path().to_path_buf(), None, None).unwrap(); + let mut lock = LockFile::new( + pkg.path().to_path_buf(), + /* manifest_digest */ "42".to_string(), + /* deps_digest */ "7".to_string(), + ) + .unwrap(); writeln!(lock, "# Write and commit").unwrap(); lock.commit(&lock_path).unwrap(); } @@ -44,7 +49,12 @@ fn discard() { let pkg = create_test_package().unwrap(); { - let mut lock = LockFile::new(pkg.path().to_path_buf(), None, None).unwrap(); + let mut lock = LockFile::new( + pkg.path().to_path_buf(), + /* manifest_digest */ "42".to_string(), + /* deps_digest */ "7".to_string(), + ) + .unwrap(); writeln!(lock, "# Write but don't commit").unwrap(); } diff --git a/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps/Move.locked index 1e1c4ff40dd60..96bb714fa5c96 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps/Move.locked @@ -3,3 +3,4 @@ [move] version = 0 manifest_digest = "71862AF018A2EB97209CD67439419DF22D890282AF1B69A6D5D69FC18AB187EE" +deps_digest = "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855" diff --git a/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps/Move.resolved index c3c1d04b308e0..4eca131492c08 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps/Move.resolved @@ -9,10 +9,8 @@ ResolvedGraph { always_deps: { "test", }, - manifest_digest: Some( - "71862AF018A2EB97209CD67439419DF22D890282AF1B69A6D5D69FC18AB187EE", - ), - deps_digest: None, + manifest_digest: "71862AF018A2EB97209CD67439419DF22D890282AF1B69A6D5D69FC18AB187EE", + deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked index cffbc1e559dd8..40aa349dfa05a 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked @@ -3,3 +3,4 @@ [move] version = 0 manifest_digest = "D9285F6EBE68E6BE673226856663965F2F1BBB3A371070418A89355F1CCC7EEE" +deps_digest = "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855" diff --git a/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved index a88a4e46a7933..dd2ae5de2711d 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved @@ -9,10 +9,8 @@ ResolvedGraph { always_deps: { "test", }, - manifest_digest: Some( - "D9285F6EBE68E6BE673226856663965F2F1BBB3A371070418A89355F1CCC7EEE", - ), - deps_digest: None, + manifest_digest: "D9285F6EBE68E6BE673226856663965F2F1BBB3A371070418A89355F1CCC7EEE", + deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved index c93b55b1eb4e3..24c54b7980766 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved @@ -9,10 +9,8 @@ ResolvedGraph { always_deps: { "test", }, - manifest_digest: Some( - "4D062BC9E2A7C54B0E372B368563BE56A371DE2855612B7AB7EF208CC6A0473C", - ), - deps_digest: None, + manifest_digest: "4D062BC9E2A7C54B0E372B368563BE56A371DE2855612B7AB7EF208CC6A0473C", + deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked index 0bdb006b21b42..953730f249416 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "3FFCC3493EF75DBA3C6232A841BC1FB786BCAFE6B3B799AF601C6EDCA342340C" +deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved index ffa7c05e735a0..253ec955c5bc4 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved @@ -98,10 +98,8 @@ ResolvedGraph { "C", "Root", }, - manifest_digest: Some( - "3FFCC3493EF75DBA3C6232A841BC1FB786BCAFE6B3B799AF601C6EDCA342340C", - ), - deps_digest: None, + manifest_digest: "3FFCC3493EF75DBA3C6232A841BC1FB786BCAFE6B3B799AF601C6EDCA342340C", + deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/dep_good_digest/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/dep_good_digest/Move.locked index 279b680126639..cf89252b77de7 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/dep_good_digest/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/dep_good_digest/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "54BEFE786504E00C25811696A09F9CB02DD4490BC4DC1B4908A02966B087656E" +deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ { name = "OtherDep", digest = "6A88B7888D6049EB0121900E22B6FA2C0E702F042C8C8D4FD62AD5C990B9F9A8", addr_subst = { "A" = "B" } }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/dep_good_digest/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/dep_good_digest/Move.resolved index 486506cc6361a..191ea04d5abdd 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/dep_good_digest/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/dep_good_digest/Move.resolved @@ -29,10 +29,8 @@ ResolvedGraph { "OtherDep", "Root", }, - manifest_digest: Some( - "54BEFE786504E00C25811696A09F9CB02DD4490BC4DC1B4908A02966B087656E", - ), - deps_digest: None, + manifest_digest: "54BEFE786504E00C25811696A09F9CB02DD4490BC4DC1B4908A02966B087656E", + deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved index f590838189c43..09e1d27b3f931 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved @@ -73,10 +73,8 @@ ResolvedGraph { "C", "Root", }, - manifest_digest: Some( - "E32AB53F4BEAAD4BD8FE9D0973DE7CB7040C542240DD032821EA30AEE5F8EC9B", - ), - deps_digest: None, + manifest_digest: "E32AB53F4BEAAD4BD8FE9D0973DE7CB7040C542240DD032821EA30AEE5F8EC9B", + deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked index 02d676e7b42aa..303820a031580 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "3DA4574008B62F8D9C7064EC085EB41A26AC3804B8B7FACFE25CA16971670BFD" +deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ { name = "C" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.resolved index b2fdf74278c4e..8c454682c8cb0 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.resolved @@ -85,10 +85,8 @@ ResolvedGraph { "C", "Root", }, - manifest_digest: Some( - "3DA4574008B62F8D9C7064EC085EB41A26AC3804B8B7FACFE25CA16971670BFD", - ), - deps_digest: None, + manifest_digest: "3DA4574008B62F8D9C7064EC085EB41A26AC3804B8B7FACFE25CA16971670BFD", + deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked index 948e07ad0ee3d..acdef4935a802 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "040CD4930E480375D9C8607C2C075023ADA58D206AC7A6353641155B2C634E18" +deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved index 273869b7e373d..7abe06c28dc39 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved @@ -77,10 +77,8 @@ ResolvedGraph { "B", "Root", }, - manifest_digest: Some( - "040CD4930E480375D9C8607C2C075023ADA58D206AC7A6353641155B2C634E18", - ), - deps_digest: None, + manifest_digest: "040CD4930E480375D9C8607C2C075023ADA58D206AC7A6353641155B2C634E18", + deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked index 41cc1a7f14c69..5f9258761d225 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "CA54ADC8F29B445D5695695C3D9B59EC57B1D2702EFBDDEBAD849A19C46EA857" +deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved index aeb078f3a0581..97a95aa2142da 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved @@ -89,10 +89,8 @@ ResolvedGraph { "B", "Root", }, - manifest_digest: Some( - "CA54ADC8F29B445D5695695C3D9B59EC57B1D2702EFBDDEBAD849A19C46EA857", - ), - deps_digest: None, + manifest_digest: "CA54ADC8F29B445D5695695C3D9B59EC57B1D2702EFBDDEBAD849A19C46EA857", + deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked index 6a310746ae17d..fb3c3b80ad72a 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "A2144C32B1220F15525DF8D7983CCBD60B5BFB0110FFFBA42C139E24997651D4" +deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.resolved index 52d2db0550c99..59ae1dd175680 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.resolved @@ -105,10 +105,8 @@ ResolvedGraph { "C", "Root", }, - manifest_digest: Some( - "A2144C32B1220F15525DF8D7983CCBD60B5BFB0110FFFBA42C139E24997651D4", - ), - deps_digest: None, + manifest_digest: "A2144C32B1220F15525DF8D7983CCBD60B5BFB0110FFFBA42C139E24997651D4", + deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked index 2d819c487f58b..c86c43f1cc1f2 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "8B86CBF4C453D3427CAB4E62E4D181D37005EF83A1BF77EE7A803F7898CB5578" +deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.resolved index ec0ea379f7973..6ae9864b4083b 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.resolved @@ -131,10 +131,8 @@ ResolvedGraph { "E", "Root", }, - manifest_digest: Some( - "8B86CBF4C453D3427CAB4E62E4D181D37005EF83A1BF77EE7A803F7898CB5578", - ), - deps_digest: None, + manifest_digest: "8B86CBF4C453D3427CAB4E62E4D181D37005EF83A1BF77EE7A803F7898CB5578", + deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked index c41207aef5472..bbc75507bc537 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "FF5591B04075491B4A3E1F8758714AD147D4C1611F9DB9F4C4D6F9FD4D521DA9" +deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_override/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_override/Move.resolved index e7da813382f43..e4295b97d0981 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_override/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_override/Move.resolved @@ -87,10 +87,8 @@ ResolvedGraph { "C", "Root", }, - manifest_digest: Some( - "FF5591B04075491B4A3E1F8758714AD147D4C1611F9DB9F4C4D6F9FD4D521DA9", - ), - deps_digest: None, + manifest_digest: "FF5591B04075491B4A3E1F8758714AD147D4C1611F9DB9F4C4D6F9FD4D521DA9", + deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked index d2a543e7e5422..a81ccef21b157 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "C8BA905B7DA7A1818B7B74ACD501041A2F3069F82B5CEAF117D4D5C8CB6F4593" +deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.resolved index 973fae2737ebb..82ddb98976abf 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.resolved @@ -129,10 +129,8 @@ ResolvedGraph { "E", "Root", }, - manifest_digest: Some( - "C8BA905B7DA7A1818B7B74ACD501041A2F3069F82B5CEAF117D4D5C8CB6F4593", - ), - deps_digest: None, + manifest_digest: "C8BA905B7DA7A1818B7B74ACD501041A2F3069F82B5CEAF117D4D5C8CB6F4593", + deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked index cb3e21ab15012..0fcc899715c45 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "50D230853475966B37D1B94D4CC975CAF6CFC98AB235A58FFC42ED5826CD1D41" +deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.resolved index 6a21e77a29369..9db20348b204a 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.resolved @@ -139,10 +139,8 @@ ResolvedGraph { "E", "Root", }, - manifest_digest: Some( - "50D230853475966B37D1B94D4CC975CAF6CFC98AB235A58FFC42ED5826CD1D41", - ), - deps_digest: None, + manifest_digest: "50D230853475966B37D1B94D4CC975CAF6CFC98AB235A58FFC42ED5826CD1D41", + deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.resolved index 851c0c2daaa24..50bbdfa34d105 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.resolved @@ -139,10 +139,8 @@ ResolvedGraph { "E", "Root", }, - manifest_digest: Some( - "B21BB5840BBEC6FAE6E54214639AD38EEB3D4B93BCA11A832654296C14DA0467", - ), - deps_digest: None, + manifest_digest: "B21BB5840BBEC6FAE6E54214639AD38EEB3D4B93BCA11A832654296C14DA0467", + deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dual_override/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dual_override/Move.resolved index ac866b4f53f3e..ba708a5c8268a 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dual_override/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_dual_override/Move.resolved @@ -139,10 +139,8 @@ ResolvedGraph { "E", "Root", }, - manifest_digest: Some( - "62F86211B60BE5FD68FC35A64C4B09D96612A1F253BB8798601A66A76CCFC78E", - ), - deps_digest: None, + manifest_digest: "62F86211B60BE5FD68FC35A64C4B09D96612A1F253BB8798601A66A76CCFC78E", + deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked index 6232cfc8b1927..62c371feb8145 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "E34EE93EB1C18B3B97CC2297679AE706FD805BBDCA9448CEDBD39C9C8BD5B1AA" +deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ { name = "A", addr_subst = { "AA" = "00000000000000000000000000000001" } }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved index 036ae9bb48ef7..b10deb8c21f97 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved @@ -73,10 +73,8 @@ ResolvedGraph { "C", "Root", }, - manifest_digest: Some( - "E34EE93EB1C18B3B97CC2297679AE706FD805BBDCA9448CEDBD39C9C8BD5B1AA", - ), - deps_digest: None, + manifest_digest: "E34EE93EB1C18B3B97CC2297679AE706FD805BBDCA9448CEDBD39C9C8BD5B1AA", + deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.resolved index fbca8677ccfd4..c1dbc9a8a30c8 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.resolved @@ -109,10 +109,8 @@ ResolvedGraph { "E", "Root", }, - manifest_digest: Some( - "97E9BC503F1174AC272326DA25D9EA119823079BB18AA7E528CAEEBA0E17E532", - ), - deps_digest: None, + manifest_digest: "97E9BC503F1174AC272326DA25D9EA119823079BB18AA7E528CAEEBA0E17E532", + deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.resolved index 7284f64b01190..c109d39490acb 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.resolved @@ -109,10 +109,8 @@ ResolvedGraph { "E", "Root", }, - manifest_digest: Some( - "0706DACA94014A2ADD1A782C6FE1B29553ED6FFDD67464A5672B900E0038C61F", - ), - deps_digest: None, + manifest_digest: "0706DACA94014A2ADD1A782C6FE1B29553ED6FFDD67464A5672B900E0038C61F", + deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked index 3683fc892128a..09ff6d4872ccb 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "9668C1DAFA74BECBEB89FDCE86BDF4C1024020661B65DB41471BBB051EA6CE4D" +deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/direct_and_indirect_dep/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/direct_and_indirect_dep/Move.resolved index a0b4610d33168..2b8dd75b92449 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/direct_and_indirect_dep/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/direct_and_indirect_dep/Move.resolved @@ -73,10 +73,8 @@ ResolvedGraph { "C", "Root", }, - manifest_digest: Some( - "9668C1DAFA74BECBEB89FDCE86BDF4C1024020661B65DB41471BBB051EA6CE4D", - ), - deps_digest: None, + manifest_digest: "9668C1DAFA74BECBEB89FDCE86BDF4C1024020661B65DB41471BBB051EA6CE4D", + deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/external/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/external/Move.locked index ad8a14db3444d..65e47dd037d77 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/external/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/external/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "0ABB58AD694B4D8B2FDA8F544B570B7BB6CFA84038FCCC4EA87236568A056D62" +deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/external/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/external/Move.resolved index a240c0223c253..17e2fee663cbb 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/external/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/external/Move.resolved @@ -51,10 +51,8 @@ ResolvedGraph { "ADep", "Root", }, - manifest_digest: Some( - "0ABB58AD694B4D8B2FDA8F544B570B7BB6CFA84038FCCC4EA87236568A056D62", - ), - deps_digest: None, + manifest_digest: "0ABB58AD694B4D8B2FDA8F544B570B7BB6CFA84038FCCC4EA87236568A056D62", + deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/external_bad_dep/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/external_bad_dep/Move.locked index 0d35cce977f90..5123e07f6454d 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/external_bad_dep/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/external_bad_dep/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "F182A02077040B04D1B9A02821A0075528FDFB7AE692706D9EBE068AD5D35776" +deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/external_dev_dep/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/external_dev_dep/Move.locked index abe898e7742b7..e7b550d4380a3 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/external_dev_dep/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/external_dev_dep/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "64CF52DCF661C2F1581935BC7AEA0424EE20B10997D1F183779443C8679727F1" +deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/external_dev_dep/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/external_dev_dep/Move.resolved index f9d511a565dc1..c59e9b285e545 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/external_dev_dep/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/external_dev_dep/Move.resolved @@ -89,10 +89,8 @@ ResolvedGraph { "ADep", "Root", }, - manifest_digest: Some( - "64CF52DCF661C2F1581935BC7AEA0424EE20B10997D1F183779443C8679727F1", - ), - deps_digest: None, + manifest_digest: "64CF52DCF661C2F1581935BC7AEA0424EE20B10997D1F183779443C8679727F1", + deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/external_overlap/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/external_overlap/Move.locked index 2d6df47b2861a..2c3e487b8d513 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/external_overlap/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/external_overlap/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "E1187C3104285580A1E8194F9C285C1A87D5732BACA176B8380028E5CE5C20F5" +deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/external_overlap/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/external_overlap/Move.resolved index 8c59a026a3ef1..175b31298301b 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/external_overlap/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/external_overlap/Move.resolved @@ -59,10 +59,8 @@ ResolvedGraph { "ADep", "Root", }, - manifest_digest: Some( - "E1187C3104285580A1E8194F9C285C1A87D5732BACA176B8380028E5CE5C20F5", - ), - deps_digest: None, + manifest_digest: "E1187C3104285580A1E8194F9C285C1A87D5732BACA176B8380028E5CE5C20F5", + deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/external_silent/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/external_silent/Move.locked index 354c1d149af01..9f32776486982 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/external_silent/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/external_silent/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "6460CC1A3791A9D0D4E91E8E3CBCF45CB61891219AF412D58AB493246E98DF36" +deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ { name = "A" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_from_lock/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_from_lock/Move.resolved index 12c654ff61590..134f096f34317 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_from_lock/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_from_lock/Move.resolved @@ -47,12 +47,8 @@ ResolvedGraph { "D", "test", }, - manifest_digest: Some( - "FE671355454D2C48E232FB7E8E32B2D48AB921C4993F4758705F3CD9BC52792F", - ), - deps_digest: Some( - "9AE2C7D9835B118893E2BF651D37467EBBC20D37D996AD986866F7351DEF407F", - ), + manifest_digest: "FE671355454D2C48E232FB7E8E32B2D48AB921C4993F4758705F3CD9BC52792F", + deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.resolved index 74d78fdcddc0a..2c8fd15887770 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.resolved @@ -47,12 +47,8 @@ ResolvedGraph { "D", "test", }, - manifest_digest: Some( - "67C70462706B452AD81EF229DD2416AB441309AD3DE961F35BB8BEBDF4FAF7CB", - ), - deps_digest: Some( - "F71A200A8561E46B0AB065FAA525F57CA5E755F304FE4A0D6AEBC85B594EAD5F", - ), + manifest_digest: "67C70462706B452AD81EF229DD2416AB441309AD3DE961F35BB8BEBDF4FAF7CB", + deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked index af3d92cce4062..d153caca5834d 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "12877D85A6540CC6483F5C5437FB4E086596015F632814B9E4AC6B6A6B94FF4F" +deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600" dependencies = [ { name = "C" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_rename/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_rename/Move.resolved index eb83be97c3e37..f019e29dacb6f 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_rename/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/multiple_deps_rename/Move.resolved @@ -47,10 +47,8 @@ ResolvedGraph { "D", "test", }, - manifest_digest: Some( - "2108F9760A5B783CE76062DC34B8D077F9EEC6D3422472558BE25966949EEC35", - ), - deps_digest: None, + manifest_digest: "2108F9760A5B783CE76062DC34B8D077F9EEC6D3422472558BE25966949EEC35", + deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/nested_deps_git_local/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/nested_deps_git_local/Move.locked index a1e36db7d0c21..eb28655ad3be8 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/nested_deps_git_local/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/nested_deps_git_local/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "0C5D381E36019E1585333C288C833EF07C2E0AC0CD76B1326E88A6765714C247" +deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ { name = "MoveNursery" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/nested_deps_git_local/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/nested_deps_git_local/Move.resolved index 5cf971f24b95c..0e53020907fee 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/nested_deps_git_local/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/nested_deps_git_local/Move.resolved @@ -55,10 +55,8 @@ ResolvedGraph { "MoveStdlib", "NestedDeps", }, - manifest_digest: Some( - "0C5D381E36019E1585333C288C833EF07C2E0AC0CD76B1326E88A6765714C247", - ), - deps_digest: None, + manifest_digest: "0C5D381E36019E1585333C288C833EF07C2E0AC0CD76B1326E88A6765714C247", + deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/nested_deps_local_local/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/nested_deps_local_local/Move.locked index 19ab1d75d3f27..8f2202bff22db 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/nested_deps_local_local/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/nested_deps_local_local/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "B3E0DD65821AEA6C343A1189D119E81DF00830A3E3B48C84D52B7018F47626F4" +deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ { name = "Nested" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/nested_deps_override/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/nested_deps_override/Move.locked index 19ab1d75d3f27..8f2202bff22db 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/nested_deps_override/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/nested_deps_override/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "B3E0DD65821AEA6C343A1189D119E81DF00830A3E3B48C84D52B7018F47626F4" +deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ { name = "Nested" }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/nested_pruned_override/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/nested_pruned_override/Move.resolved index f72d662fb7a12..c98b562cf4017 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/nested_pruned_override/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/nested_pruned_override/Move.resolved @@ -73,10 +73,8 @@ ResolvedGraph { "C", "Root", }, - manifest_digest: Some( - "B0F678B9227387AF29ACA8CFA4EB437787A2FC7690E2627761402DE85C728E51", - ), - deps_digest: None, + manifest_digest: "B0F678B9227387AF29ACA8CFA4EB437787A2FC7690E2627761402DE85C728E51", + deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/one_dep/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/one_dep/Move.locked index db3724ff925f8..0ef21df3129f5 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/one_dep/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/one_dep/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "6DF52ED8DD301E9689CF4329C4765A048E0669FC794CE7DAC182AEE352FC099D" +deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ { name = "OtherDep", addr_subst = { "A" = "B" } }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/one_dep/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/one_dep/Move.resolved index a1238d2ef8a65..e0081492f0d1b 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/one_dep/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/one_dep/Move.resolved @@ -29,10 +29,8 @@ ResolvedGraph { "OtherDep", "Root", }, - manifest_digest: Some( - "6DF52ED8DD301E9689CF4329C4765A048E0669FC794CE7DAC182AEE352FC099D", - ), - deps_digest: None, + manifest_digest: "6DF52ED8DD301E9689CF4329C4765A048E0669FC794CE7DAC182AEE352FC099D", + deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved index 0d7d3836d7938..b5615e1246f85 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved @@ -29,10 +29,8 @@ ResolvedGraph { "OtherDep", "Root", }, - manifest_digest: Some( - "4E7F1AB3DAE2E52F6D5C1C326BB270B2097D47C8964275046E002AB005B38E2B", - ), - deps_digest: None, + manifest_digest: "4E7F1AB3DAE2E52F6D5C1C326BB270B2097D47C8964275046E002AB005B38E2B", + deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/one_dep_bad_digest/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/one_dep_bad_digest/Move.locked index c45e20cfebea7..1efdde28cfcb0 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/one_dep_bad_digest/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/one_dep_bad_digest/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "A5456BB6D4506B75AF7F522F1B1F3AE429D1D23118875C79D1A8006EA28E4AD5" +deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ { name = "OtherDep", digest = "BAD_DIGEST", addr_subst = { "A" = "B" } }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved index 4f8ecfd8e431f..fd478be6d2148 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved @@ -29,10 +29,8 @@ ResolvedGraph { "OtherDep", "Root", }, - manifest_digest: Some( - "6DF52ED8DD301E9689CF4329C4765A048E0669FC794CE7DAC182AEE352FC099D", - ), - deps_digest: None, + manifest_digest: "6DF52ED8DD301E9689CF4329C4765A048E0669FC794CE7DAC182AEE352FC099D", + deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/one_dep_override/Move.locked b/external-crates/move/tools/move-package/tests/test_sources/one_dep_override/Move.locked index d275be6287ffa..cbaad422258fa 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/one_dep_override/Move.locked +++ b/external-crates/move/tools/move-package/tests/test_sources/one_dep_override/Move.locked @@ -3,6 +3,7 @@ [move] version = 0 manifest_digest = "D302CF1372F684FE59216E574C32DDAAF97E6EB16A6224E21EA7E6ADD82EFEDF" +deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082" dependencies = [ { name = "OtherDep", addr_subst = { "A" = "B" } }, diff --git a/external-crates/move/tools/move-package/tests/test_sources/one_dep_override/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/one_dep_override/Move.resolved index bb542edfabccf..445ee2847596e 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/one_dep_override/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/one_dep_override/Move.resolved @@ -29,10 +29,8 @@ ResolvedGraph { "OtherDep", "Root", }, - manifest_digest: Some( - "D302CF1372F684FE59216E574C32DDAAF97E6EB16A6224E21EA7E6ADD82EFEDF", - ), - deps_digest: None, + manifest_digest: "D302CF1372F684FE59216E574C32DDAAF97E6EB16A6224E21EA7E6ADD82EFEDF", + deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved index 0425ea8a68a94..3f1bc3ac9ee73 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved @@ -29,10 +29,8 @@ ResolvedGraph { "OtherDep", "Root", }, - manifest_digest: Some( - "5D172B35863F3E290860CC7CD5D02FA7195D005ABC6668E1EC2EC84D7D096481", - ), - deps_digest: None, + manifest_digest: "5D172B35863F3E290860CC7CD5D02FA7195D005ABC6668E1EC2EC84D7D096481", + deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved index 92c72e5767926..25fa482fa3223 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved @@ -29,10 +29,8 @@ ResolvedGraph { "OtherDep", "Root", }, - manifest_digest: Some( - "6DF52ED8DD301E9689CF4329C4765A048E0669FC794CE7DAC182AEE352FC099D", - ), - deps_digest: None, + manifest_digest: "6DF52ED8DD301E9689CF4329C4765A048E0669FC794CE7DAC182AEE352FC099D", + deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/package_hooks/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/package_hooks/Move.resolved index 9702bd9585625..c942874984d2b 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/package_hooks/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/package_hooks/Move.resolved @@ -1 +1 @@ -Fetching 'Pkg': TestHooks resolve dep "Pkg" = "localhost:8080" "Pkg" "0x1" "" +Failed to resolve dependencies for package 'test': Fetching 'Pkg': TestHooks resolve dep "Pkg" = "localhost:8080" "Pkg" "0x1" "" diff --git a/external-crates/move/tools/move-package/tests/test_sources/package_hooks_subdir/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/package_hooks_subdir/Move.resolved index 44eed9370b781..f855ef689ac6e 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/package_hooks_subdir/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/package_hooks_subdir/Move.resolved @@ -1 +1 @@ -Fetching 'Pkg': TestHooks resolve dep "Pkg" = "localhost:8080" "Pkg" "0x1" "foo/bar" +Failed to resolve dependencies for package 'test': Fetching 'Pkg': TestHooks resolve dep "Pkg" = "localhost:8080" "Pkg" "0x1" "foo/bar" diff --git a/external-crates/move/tools/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.resolved index 22a70e627925c..22e4616651599 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.resolved @@ -9,10 +9,8 @@ ResolvedGraph { always_deps: { "name", }, - manifest_digest: Some( - "63CD0B93C3CE9122732229F8C319D52AF78217456BF617FE9418F98550AE8345", - ), - deps_digest: None, + manifest_digest: "63CD0B93C3CE9122732229F8C319D52AF78217456BF617FE9418F98550AE8345", + deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/parsing_edition_legacy/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/parsing_edition_legacy/Move.resolved index c864ad7767b80..36a4de89a3020 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/parsing_edition_legacy/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/parsing_edition_legacy/Move.resolved @@ -9,10 +9,8 @@ ResolvedGraph { always_deps: { "name", }, - manifest_digest: Some( - "2B505B7D6ED832ED552497073A9AA2F8A48244A0C41CDC6F4F7F22A05A471B18", - ), - deps_digest: None, + manifest_digest: "2B505B7D6ED832ED552497073A9AA2F8A48244A0C41CDC6F4F7F22A05A471B18", + deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/parsing_flavor_global_storage/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/parsing_flavor_global_storage/Move.resolved index 13290f3a7692c..6a79b88917d83 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/parsing_flavor_global_storage/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/parsing_flavor_global_storage/Move.resolved @@ -9,10 +9,8 @@ ResolvedGraph { always_deps: { "name", }, - manifest_digest: Some( - "FC0696A769A6ACA88ED23495C9051F1D8389D2A70675D9C35E54DC67C793DFC7", - ), - deps_digest: None, + manifest_digest: "FC0696A769A6ACA88ED23495C9051F1D8389D2A70675D9C35E54DC67C793DFC7", + deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/parsing_flavor_sui/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/parsing_flavor_sui/Move.resolved index b219a1d20a05c..7d7b984c8e8c3 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/parsing_flavor_sui/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/parsing_flavor_sui/Move.resolved @@ -9,10 +9,8 @@ ResolvedGraph { always_deps: { "name", }, - manifest_digest: Some( - "AC62FD89ADEA9C9E6795CE0CF0A809754CC517DA8C9E3D1A1A602636393187D6", - ), - deps_digest: None, + manifest_digest: "AC62FD89ADEA9C9E6795CE0CF0A809754CC517DA8C9E3D1A1A602636393187D6", + deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved index dee127c34592e..709ade6da529b 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved @@ -9,10 +9,8 @@ ResolvedGraph { always_deps: { "®´∑œ", }, - manifest_digest: Some( - "F85E4EDBC095AC28132481BE5C69A6D293D2B9FAA23DA828A6B6F6AF0F204E65", - ), - deps_digest: None, + manifest_digest: "F85E4EDBC095AC28132481BE5C69A6D293D2B9FAA23DA828A6B6F6AF0F204E65", + deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved b/external-crates/move/tools/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved index 9901d276f15dd..4054d7c5c9e9a 100644 --- a/external-crates/move/tools/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved +++ b/external-crates/move/tools/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved @@ -9,10 +9,8 @@ ResolvedGraph { always_deps: { "name", }, - manifest_digest: Some( - "40ECD99EA24DDE388D25DBAB6EFAAF04543D55F0AD108BA6F489B0C71BB618AB", - ), - deps_digest: None, + manifest_digest: "40ECD99EA24DDE388D25DBAB6EFAAF04543D55F0AD108BA6F489B0C71BB618AB", + deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855", }, build_options: BuildConfig { dev_mode: true, diff --git a/external-crates/move/tools/move-package/tests/test_sources/resolvers/silent.sh b/external-crates/move/tools/move-package/tests/test_sources/resolvers/silent.sh index e5d20da09ee90..69616a2cbe024 100755 --- a/external-crates/move/tools/move-package/tests/test_sources/resolvers/silent.sh +++ b/external-crates/move/tools/move-package/tests/test_sources/resolvers/silent.sh @@ -10,6 +10,8 @@ PACKAGE="$2" cat <