Merge branch 'master' into matt/bump-revm2

Author: mattsse

crates/forge/bin/cmd/script/multi.rs

@@ -5,7 +5,7 @@ use super::{
     ScriptArgs,
 };
 use ethers::signers::LocalWallet;
-use eyre::{ContextCompat, Result, WrapErr};
+use eyre::{ContextCompat, Report, Result, WrapErr};
 use foundry_cli::utils::now;
 use foundry_common::{fs, get_http_provider};
 use foundry_compilers::{artifacts::Libraries, ArtifactId};
@@ -139,37 +139,35 @@ impl ScriptArgs {
                 join_all(futs).await.into_iter().filter(|res| res.is_err()).collect::<Vec<_>>();
 
             if !errors.is_empty() {
-                return Err(eyre::eyre!("{errors:?}"))
+                return Err(eyre::eyre!("{errors:?}"));
             }
         }
 
         trace!(target: "script", "broadcasting multi chain deployments");
 
-        let futs = deployments
-            .deployments
-            .iter_mut()
-            .map(|sequence| async {
-                match self
-                    .send_transactions(
-                        sequence,
-                        &sequence.typed_transactions().first().unwrap().0.clone(),
-                        &script_wallets,
-                    )
-                    .await
-                {
-                    Ok(_) => {
-                        if self.verify {
-                            return sequence.verify_contracts(config, verify.clone()).await
-                        }
-                        Ok(())
+        let mut results: Vec<Result<(), Report>> = Vec::new();
+
+        for sequence in deployments.deployments.iter_mut() {
+            let result = match self
+                .send_transactions(
+                    sequence,
+                    &sequence.typed_transactions().first().unwrap().0.clone(),
+                    &script_wallets,
+                )
+                .await
+            {
+                Ok(_) => {
+                    if self.verify {
+                        return sequence.verify_contracts(config, verify.clone()).await
                     }
-                    Err(err) => Err(err),
+                    Ok(())
                 }
-            })
-            .collect::<Vec<_>>();
+                Err(err) => Err(err),
+            };
+            results.push(result);
+        }
 
-        let errors =
-            join_all(futs).await.into_iter().filter(|res| res.is_err()).collect::<Vec<_>>();
+        let errors = results.into_iter().filter(|res| res.is_err()).collect::<Vec<_>>();
 
         if !errors.is_empty() {
             return Err(eyre::eyre!("{errors:?}"))

crates/forge/tests/cli/cmd.rs

@@ -807,7 +807,7 @@ forgetest!(
             dss_exec_lib,
             "-vvv",
         ]);
-        cmd.print_output();
+        cmd.assert_non_empty_stdout();
     }
 );
 
@@ -1177,21 +1177,18 @@ contract ContractThreeTest is DSTest {
     cmd.forge_fuse();
     let first_out = cmd.arg("test").arg("--gas-report").stdout_lossy();
     assert!(first_out.contains("foo") && first_out.contains("bar") && first_out.contains("baz"));
-    // cmd.arg("test").arg("--gas-report").print_output();
 
     cmd.forge_fuse();
     prj.write_config(Config { gas_reports: (vec![]), ..Default::default() });
     cmd.forge_fuse();
     let second_out = cmd.arg("test").arg("--gas-report").stdout_lossy();
     assert!(second_out.contains("foo") && second_out.contains("bar") && second_out.contains("baz"));
-    // cmd.arg("test").arg("--gas-report").print_output();
 
     cmd.forge_fuse();
     prj.write_config(Config { gas_reports: (vec!["*".to_string()]), ..Default::default() });
     cmd.forge_fuse();
     let third_out = cmd.arg("test").arg("--gas-report").stdout_lossy();
     assert!(third_out.contains("foo") && third_out.contains("bar") && third_out.contains("baz"));
-    // cmd.arg("test").arg("--gas-report").print_output();
 
     cmd.forge_fuse();
     prj.write_config(Config {
@@ -1205,7 +1202,6 @@ contract ContractThreeTest is DSTest {
     cmd.forge_fuse();
     let fourth_out = cmd.arg("test").arg("--gas-report").stdout_lossy();
     assert!(fourth_out.contains("foo") && fourth_out.contains("bar") && fourth_out.contains("baz"));
-    // cmd.arg("test").arg("--gas-report").print_output();
 });
 
 forgetest!(gas_report_some_contracts, |prj, cmd| {
@@ -1310,7 +1306,6 @@ contract ContractThreeTest is DSTest {
     cmd.forge_fuse();
     let first_out = cmd.arg("test").arg("--gas-report").stdout_lossy();
     assert!(first_out.contains("foo") && !first_out.contains("bar") && !first_out.contains("baz"));
-    // cmd.arg("test").arg("--gas-report").print_output();
 
     // report for Two
     cmd.forge_fuse();
@@ -1323,7 +1318,6 @@ contract ContractThreeTest is DSTest {
     assert!(
         !second_out.contains("foo") && second_out.contains("bar") && !second_out.contains("baz")
     );
-    // cmd.arg("test").arg("--gas-report").print_output();
 
     // report for Three
     cmd.forge_fuse();
@@ -1334,7 +1328,6 @@ contract ContractThreeTest is DSTest {
     cmd.forge_fuse();
     let third_out = cmd.arg("test").arg("--gas-report").stdout_lossy();
     assert!(!third_out.contains("foo") && !third_out.contains("bar") && third_out.contains("baz"));
-    // cmd.arg("test").arg("--gas-report").print_output();
 });
 
 forgetest!(gas_ignore_some_contracts, |prj, cmd| {
@@ -1439,7 +1432,6 @@ contract ContractThreeTest is DSTest {
     cmd.forge_fuse();
     let first_out = cmd.arg("test").arg("--gas-report").stdout_lossy();
     assert!(!first_out.contains("foo") && first_out.contains("bar") && first_out.contains("baz"));
-    // cmd.arg("test").arg("--gas-report").print_output();
 
     // ignore ContractTwo
     cmd.forge_fuse();
@@ -1453,7 +1445,6 @@ contract ContractThreeTest is DSTest {
     assert!(
         second_out.contains("foo") && !second_out.contains("bar") && second_out.contains("baz")
     );
-    // cmd.arg("test").arg("--gas-report").print_output();
 
     // ignore ContractThree
     cmd.forge_fuse();

crates/forge/tests/cli/doc.rs

@@ -4,8 +4,5 @@ use foundry_test_utils::util::{setup_forge_remote, RemoteProject};
 fn can_generate_solmate_docs() {
     let (prj, _) =
         setup_forge_remote(RemoteProject::new("transmissions11/solmate").set_build(false));
-    prj.forge_command()
-        .args(["doc", "--build"])
-        .ensure_execute_success()
-        .expect("`forge doc` failed");
+    prj.forge_command().args(["doc", "--build"]).assert_success();
 }

crates/forge/tests/cli/ext_integration.rs

@@ -11,7 +11,13 @@ forgetest_external!(
 forgetest_external!(stringutils, "Arachnid/solidity-stringutils");
 forgetest_external!(lootloose, "gakonst/lootloose");
 forgetest_external!(lil_web3, "m1guelpf/lil-web3");
-forgetest_external!(snekmate, "pcaversaccio/snekmate");
+forgetest_external!(
+    // https://github.com/foundry-rs/foundry/pull/6280
+    // `run: pnpm --version` is ok, `Command::new("pnpm")` isn't. Good job Windows.
+    #[cfg_attr(windows, ignore = "Windows cannot find installed programs")]
+    snekmate,
+    "pcaversaccio/snekmate"
+);
 
 // Forking tests