Metadata refactor 2

Author: ksew1

crates/forge/test_utils/src/runner.rs

@@ -16,9 +16,9 @@ use forge_runner::{
 };
 use foundry_ui::UI;
 use indoc::formatdoc;
+use scarb_api::metadata::get_metadata_for_dir;
 use scarb_api::{
-    CompilationOpts, ScarbCommand, StarknetContractArtifacts,
-    get_contracts_artifacts_and_source_sierra_paths, metadata::MetadataCommandExt,
+    CompilationOpts, StarknetContractArtifacts, get_contracts_artifacts_and_source_sierra_paths,
     target_dir_for_workspace,
 };
 use shared::command::CommandExt;
@@ -94,10 +94,7 @@ impl Contract {
             .output_checked()
             .context("Failed to build contracts with Scarb")?;
 
-        let scarb_metadata = ScarbCommand::metadata()
-            .current_dir(dir.path())
-            .inherit_stderr()
-            .run()?;
+        let scarb_metadata = get_metadata_for_dir(dir.path())?;
         let package = scarb_metadata
             .packages
             .iter()

crates/forge/test_utils/src/running_tests.rs

@@ -15,7 +15,8 @@ use forge_runner::forge_config::{
 };
 use forge_runner::test_target_summary::TestTargetSummary;
 use foundry_ui::UI;
-use scarb_api::{ScarbCommand, metadata::MetadataCommandExt};
+use scarb_api::ScarbCommand;
+use scarb_api::metadata::get_metadata_for_dir;
 use std::num::NonZeroU32;
 use std::sync::Arc;
 use tempfile::tempdir;
@@ -33,10 +34,7 @@ pub fn run_test_case(
         .run()
         .unwrap();
 
-    let metadata = ScarbCommand::metadata()
-        .current_dir(test.path().unwrap())
-        .run()
-        .unwrap();
+    let metadata = get_metadata_for_dir(test.path().unwrap()).unwrap();
 
     let package = metadata
         .packages

crates/sncast/src/helpers/scarb_utils.rs

@@ -40,11 +40,8 @@ pub fn get_scarb_manifest_for(dir: &Utf8Path) -> Result<Utf8PathBuf> {
 fn get_scarb_metadata_command(manifest_path: &Utf8PathBuf) -> Result<MetadataCommand> {
     ScarbCommand::new().ensure_available()?;
 
-    let mut command = ScarbCommand::metadata();
-    command
-        .inherit_stderr()
-        .manifest_path(manifest_path)
-        .no_deps();
+    let mut command = MetadataCommand::new();
+    command.inherit_stderr().manifest_path(manifest_path);
     Ok(command)
 }