perf: borrow output when building test runner (#8294)

* chore: borrow output when building test runner

* chore: strip always

* chore: lenient stripping

* fix

* fix: don't actually strip always

Author: DaniPopes

crates/common/src/compile.rs

@@ -292,9 +292,7 @@ impl ContractSources {
         libraries: Option<&Libraries>,
     ) -> Result<Self> {
         let mut sources = Self::default();
-
         sources.insert(output, root, libraries)?;
-
         Ok(sources)
     }
 

crates/forge/bin/cmd/clone.rs

@@ -571,7 +571,7 @@ pub fn find_main_contract<'a>(
             rv = Some((PathBuf::from(f), a));
         }
     }
-    rv.ok_or(eyre::eyre!("contract not found"))
+    rv.ok_or_else(|| eyre::eyre!("contract not found"))
 }
 
 #[cfg(test)]

crates/forge/bin/cmd/coverage.rs

@@ -90,7 +90,7 @@ impl CoverageArgs {
         let report = self.prepare(&project, &output)?;
 
         p_println!(!self.test.build_args().silent => "Running tests...");
-        self.collect(project, output, report, Arc::new(config), evm_opts).await
+        self.collect(project, &output, report, Arc::new(config), evm_opts).await
     }
 
     /// Builds the project.
@@ -222,7 +222,7 @@ impl CoverageArgs {
     async fn collect(
         self,
         project: Project,
-        output: ProjectCompileOutput,
+        output: &ProjectCompileOutput,
         mut report: CoverageReport,
         config: Arc<Config>,
         evm_opts: EvmOpts,

crates/forge/bin/cmd/test/mod.rs

@@ -294,12 +294,7 @@ impl TestArgs {
 
         // Prepare the test builder
         let should_debug = self.debug.is_some();
-
-        // Clone the output only if we actually need it later for the debugger.
-        let output_clone = should_debug.then(|| output.clone());
-
         let config = Arc::new(config);
-
         let runner = MultiContractRunnerBuilder::new(config.clone())
             .set_debug(should_debug)
             .initial_balance(evm_opts.initial_balance)
@@ -308,7 +303,7 @@ impl TestArgs {
             .with_fork(evm_opts.get_fork(&config, env.clone()))
             .with_test_options(test_options)
             .enable_isolation(evm_opts.isolate)
-            .build(project_root, output, env, evm_opts)?;
+            .build(project_root, &output, env, evm_opts)?;
 
         if let Some(debug_test_pattern) = &self.debug {
             let test_pattern = &mut filter.args_mut().test_pattern;
@@ -335,11 +330,8 @@ impl TestArgs {
                 return Err(eyre::eyre!("no tests were executed"));
             };
 
-            let sources = ContractSources::from_project_output(
-                output_clone.as_ref().unwrap(),
-                project.root(),
-                Some(&libraries),
-            )?;
+            let sources =
+                ContractSources::from_project_output(&output, project.root(), Some(&libraries))?;
 
             // Run the debugger.
             let mut builder = Debugger::builder()

crates/forge/src/multi_runner.rs

@@ -365,12 +365,21 @@ impl MultiContractRunnerBuilder {
     pub fn build<C: Compiler>(
         self,
         root: &Path,
-        output: ProjectCompileOutput<C>,
+        output: &ProjectCompileOutput<C>,
         env: revm::primitives::Env,
         evm_opts: EvmOpts,
     ) -> Result<MultiContractRunner> {
-        let output = output.with_stripped_file_prefixes(root);
-        let linker = Linker::new(root, output.artifact_ids().collect());
+        let contracts = output
+            .artifact_ids()
+            .map(|(mut id, v)| {
+                // TODO: Use ArtifactId::with_stripped_file_prefixes
+                if let Ok(stripped) = id.source.strip_prefix(root) {
+                    id.source = stripped.to_path_buf();
+                }
+                (id, v)
+            })
+            .collect();
+        let linker = Linker::new(root, contracts);
 
         // Build revert decoder from ABIs of all artifacts.
         let abis = linker

crates/forge/tests/it/test_helpers.rs

@@ -175,6 +175,8 @@ impl ForgeTestData {
     ///
     /// Uses [get_compiled] to lazily compile the project.
     pub fn new(profile: ForgeTestProfile) -> Self {
+        init_tracing();
+
         let mut project = profile.project();
         let output = get_compiled(&mut project);
         let test_opts = profile.test_opts(&output);
@@ -220,9 +222,6 @@ impl ForgeTestData {
             opts.isolate = true;
         }
 
-        let env = opts.local_evm_env();
-        let output = self.output.clone();
-
         let sender = config.sender;
 
         let mut builder = self.base_runner();
@@ -231,7 +230,7 @@ impl ForgeTestData {
             .enable_isolation(opts.isolate)
             .sender(sender)
             .with_test_options(self.test_opts.clone())
-            .build(root, output, env, opts)
+            .build(root, &self.output, opts.local_evm_env(), opts)
             .unwrap()
     }
 
@@ -240,7 +239,7 @@ impl ForgeTestData {
         let mut opts = self.evm_opts.clone();
         opts.verbosity = 5;
         self.base_runner()
-            .build(self.project.root(), self.output.clone(), opts.local_evm_env(), opts)
+            .build(self.project.root(), &self.output, opts.local_evm_env(), opts)
             .unwrap()
     }
 
@@ -256,7 +255,7 @@ impl ForgeTestData {
 
         self.base_runner()
             .with_fork(fork)
-            .build(self.project.root(), self.output.clone(), env, opts)
+            .build(self.project.root(), &self.output, env, opts)
             .unwrap()
     }
 }
@@ -273,12 +272,16 @@ pub fn get_vyper() -> Vyper {
         #[cfg(target_family = "unix")]
         use std::{fs::Permissions, os::unix::fs::PermissionsExt};
 
-        let url = match svm::platform() {
-            svm::Platform::MacOsAarch64 => "https://github.com/vyperlang/vyper/releases/download/v0.4.0rc6/vyper.0.4.0rc6+commit.33719560.darwin",
-            svm::Platform::LinuxAmd64 => "https://github.com/vyperlang/vyper/releases/download/v0.4.0rc6/vyper.0.4.0rc6+commit.33719560.linux",
-            svm::Platform::WindowsAmd64 => "https://github.com/vyperlang/vyper/releases/download/v0.4.0rc6/vyper.0.4.0rc6+commit.33719560.windows.exe",
-            _ => panic!("unsupported")
+        let suffix = match svm::platform() {
+            svm::Platform::MacOsAarch64 => "darwin",
+            svm::Platform::LinuxAmd64 => "linux",
+            svm::Platform::WindowsAmd64 => "windows.exe",
+            platform => panic!(
+                "unsupported platform {platform:?} for installing vyper, \
+                 install it manually and add it to $PATH"
+            ),
         };
+        let url = format!("https://github.com/vyperlang/vyper/releases/download/v0.4.0/vyper.0.4.0+commit.e9db8d9f.{suffix}");
 
         let res = reqwest::Client::builder().build().unwrap().get(url).send().await.unwrap();