[packages] Modify dependency graph construction to use lock files

crates/sui-core/src/unit_tests/move_package_publish_tests.rs

@@ -210,6 +210,7 @@ async fn test_generate_lock_file() {
 
         [move]
         version = 0
+        manifest_digest = "1401DE1C3C3FF6D20EB27741A0A7B5D61E34836CB6C90ECC2F2DE97C47B4D0F9"
 
         dependencies = [
           { name = "Examples" },

external-crates/move/tools/move-cli/tests/build_tests/circular_dependencies/args.exp

@@ -1,2 +1,7 @@
 Command `build -v`:
-Error: Found cycle between packages: Foo -> Bar -> Foo
+Error: Failed to resolve dependencies for package 'Foo'
+
+Caused by:
+    0: Failed to resolve dependencies for package 'Bar'
+    1: Failed to resolve dependencies for package 'Foo'
+    2: Found cycle between packages: Bar -> Foo -> Bar

external-crates/move/tools/move-cli/tests/build_tests/unbound_dependency/args.exp

@@ -3,5 +3,4 @@ Error: Failed to resolve dependencies for package 'A'
 
 Caused by:
     0: Parsing manifest for 'Foo'
-    1: Unable to find package manifest at "./foo"
-    2: No such file or directory (os error 2)
+    1: No such file or directory (os error 2)

external-crates/move/tools/move-package/src/lib.rs

@@ -14,12 +14,9 @@ use clap::*;
 use move_compiler::editions::{Edition, Flavor};
 use move_core_types::account_address::AccountAddress;
 use move_model::model::GlobalEnv;
-use resolution::{
-    dependency_cache::DependencyCache, dependency_graph::DependencyGraph,
-    resolution_graph::ResolvedGraph,
-};
+use resolution::{dependency_graph::DependencyGraphBuilder, resolution_graph::ResolvedGraph};
 use serde::{Deserialize, Serialize};
-use source_package::layout::SourcePackageLayout;
+use source_package::{layout::SourcePackageLayout, parsed_manifest::DependencyKind};
 use std::{
     collections::BTreeMap,
     io::Write,
@@ -31,7 +28,6 @@ use crate::{
         build_plan::BuildPlan, compiled_package::CompiledPackage, model_builder::ModelBuilder,
     },
     package_lock::PackageLock,
-    source_package::manifest_parser,
 };
 
 #[derive(Debug, Parser, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Default)]
@@ -138,14 +134,12 @@ impl BuildConfig {
 
     pub fn download_deps_for_package<W: Write>(&self, path: &Path, writer: &mut W) -> Result<()> {
         let path = SourcePackageLayout::try_find_root(path)?;
-        let toml_manifest =
-            self.parse_toml_manifest(path.join(SourcePackageLayout::Manifest.path()))?;
+        let manifest_string =
+            std::fs::read_to_string(path.join(SourcePackageLayout::Manifest.path()))?;
+        let lock_string = std::fs::read_to_string(path.join(SourcePackageLayout::Lock.path())).ok();
         let _mutx = PackageLock::lock(); // held until function returns
 
-        // This should be locked as it inspects the environment for `MOVE_HOME` which could
-        // possibly be set by a different process in parallel.
-        let manifest = manifest_parser::parse_source_manifest(toml_manifest)?;
-        resolution::download_dependency_repos(&manifest, self, &path, writer)?;
+        resolution::download_dependency_repos(manifest_string, lock_string, self, &path, writer)?;
         Ok(())
     }
 
@@ -158,29 +152,39 @@ impl BuildConfig {
             self.dev_mode = true;
         }
         let path = SourcePackageLayout::try_find_root(path)?;
-        let toml_manifest =
-            self.parse_toml_manifest(path.join(SourcePackageLayout::Manifest.path()))?;
+        let manifest_string =
+            std::fs::read_to_string(path.join(SourcePackageLayout::Manifest.path()))?;
+        let lock_string = std::fs::read_to_string(path.join(SourcePackageLayout::Lock.path())).ok();
         let _mutx = PackageLock::lock(); // held until function returns
 
-        // This should be locked as it inspects the environment for `MOVE_HOME` which could
-        // possibly be set by a different process in parallel.
-        let manifest = manifest_parser::parse_source_manifest(toml_manifest)?;
-
-        let mut dependency_cache = DependencyCache::new(self.skip_fetch_latest_git_deps);
-        let dependency_graph =
-            DependencyGraph::new(&manifest, path.clone(), &mut dependency_cache, writer)?;
-
-        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)?;
+        let mut dep_graph_builder =
+            DependencyGraphBuilder::new(self.skip_fetch_latest_git_deps, writer);
+        let (dependency_graph, modified) = dep_graph_builder.get_graph(
+            &DependencyKind::default(),
+            path.clone(),
+            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)?;
+            }
         }
 
-        ResolvedGraph::resolve(dependency_graph, self, &mut dependency_cache, writer)
-    }
-
-    fn parse_toml_manifest(&self, path: PathBuf) -> Result<toml::Value> {
-        let manifest_string = std::fs::read_to_string(path)?;
-        manifest_parser::parse_move_manifest_string(manifest_string)
+        let DependencyGraphBuilder {
+            mut dependency_cache,
+            progress_output,
+            ..
+        } = dep_graph_builder;
+
+        ResolvedGraph::resolve(
+            dependency_graph,
+            self,
+            &mut dependency_cache,
+            progress_output,
+        )
     }
 }

external-crates/move/tools/move-package/src/resolution/dependency_cache.rs

@@ -77,7 +77,6 @@ impl DependencyCache {
                         "FETCHING GIT DEPENDENCY".bold().green(),
                         git_url,
                     )?;
-
                     // If the cached folder does not exist, download and clone accordingly
                     Command::new("git")
                         .args([OsStr::new("clone"), os_git_url, git_path.as_os_str()])