test: make forgetest_init! init an empty project (#12335)

* wip

* empty

* Revert "empty"

This reverts commit d96dac1.

* more

* a

Author: DaniPopes

crates/cast/tests/cli/main.rs

@@ -2765,6 +2765,7 @@ forgetest_async!(show_state_changes_in_traces, |prj, cmd| {
     let (api, handle) = anvil::spawn(NodeConfig::test()).await;
 
     foundry_test_utils::util::initialize(prj.root());
+    prj.initialize_default_contracts();
     // Deploy counter contract.
     cmd.args([
         "script",
@@ -2933,6 +2934,7 @@ forgetest_async!(cast_call_disable_labels, |prj, cmd| {
     let (_, handle) = anvil::spawn(NodeConfig::test()).await;
 
     foundry_test_utils::util::initialize(prj.root());
+    prj.initialize_default_contracts();
     prj.add_source(
         "Counter",
         r#"
@@ -3034,6 +3036,7 @@ forgetest_async!(cast_call_custom_override, |prj, cmd| {
     let (_, handle) = anvil::spawn(NodeConfig::test()).await;
 
     foundry_test_utils::util::initialize(prj.root());
+    prj.initialize_default_contracts();
     prj.add_source(
         "Counter",
         r#"

crates/cheatcodes/src/json.rs

@@ -801,14 +801,15 @@ mod tests {
     use proptest::{arbitrary::any, prop_oneof, strategy::Strategy};
     use std::collections::HashSet;
 
-    fn contains_tuple(value: &DynSolValue) -> bool {
-        match value {
-            DynSolValue::Tuple(_) | DynSolValue::CustomStruct { .. } => true,
-            DynSolValue::Array(v) | DynSolValue::FixedArray(v) => {
-                v.first().is_some_and(contains_tuple)
-            }
-            _ => false,
-        }
+    fn valid_value(value: &DynSolValue) -> bool {
+        (match value {
+            DynSolValue::String(s) if s == "{}" => false,
+
+            DynSolValue::Tuple(_) | DynSolValue::CustomStruct { .. } => false,
+
+            DynSolValue::Array(v) | DynSolValue::FixedArray(v) => v.iter().all(valid_value),
+            _ => true,
+        }) && value.as_type().is_some()
     }
 
     /// [DynSolValue::Bytes] of length 32 and 20 are converted to [DynSolValue::FixedBytes] and
@@ -836,10 +837,7 @@ mod tests {
     }
 
     fn guessable_types() -> impl proptest::strategy::Strategy<Value = DynSolValue> {
-        any::<DynSolValue>()
-            .prop_map(fixup_guessable)
-            .prop_filter("tuples are not supported", |v| !contains_tuple(v))
-            .prop_filter("filter out values without type", |v| v.as_type().is_some())
+        any::<DynSolValue>().prop_map(fixup_guessable).prop_filter("invalid value", valid_value)
     }
 
     /// A proptest strategy for generating a (simple) `DynSolValue::CustomStruct`

crates/chisel/tests/it/repl/session.rs

@@ -25,6 +25,7 @@ impl ChiselSession {
         let project = foundry_test_utils::TestProject::new(name, PathStyle::Dapptools);
         if init {
             foundry_test_utils::util::initialize(project.root());
+            project.initialize_default_contracts();
         }
 
         let bin = env!("CARGO_BIN_EXE_chisel");

crates/forge/tests/cli/bind.rs

@@ -1,6 +1,5 @@
 // <https://github.com/foundry-rs/foundry/issues/9482>
-forgetest_init!(bind_unlinked_bytecode, |prj, cmd| {
-    prj.wipe();
+forgetest!(bind_unlinked_bytecode, |prj, cmd| {
     prj.add_source(
         "SomeLibContract.sol",
         r#"

crates/forge/tests/cli/build.rs

@@ -3,6 +3,7 @@ use foundry_test_utils::{forgetest, snapbox::IntoData, str};
 use globset::Glob;
 
 forgetest_init!(can_parse_build_filters, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.clear();
 
     cmd.args(["build", "--names", "--skip", "tests", "scripts"]).assert_success().stdout_eq(str![
@@ -158,6 +159,7 @@ No files changed, compilation skipped
 
 // tests build output is as expected
 forgetest_init!(exact_build_output, |prj, cmd| {
+    prj.initialize_default_contracts();
     cmd.args(["build", "--force"]).assert_success().stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
 [SOLC_VERSION] [ELAPSED]
@@ -168,6 +170,7 @@ Compiler run successful!
 
 // tests build output is as expected
 forgetest_init!(build_sizes_no_forge_std, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.update_config(|config| {
         config.solc = Some(foundry_config::SolcReq::Version(semver::Version::new(0, 8, 27)));
     });
@@ -211,6 +214,7 @@ forgetest_init!(build_sizes_no_forge_std, |prj, cmd| {
 
 // tests build output --sizes handles multiple contracts with the same name
 forgetest_init!(build_sizes_multiple_contracts, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.add_source(
         "Foo",
         r"
@@ -277,6 +281,7 @@ contract Counter {
 
 // tests build output --sizes --json handles multiple contracts with the same name
 forgetest_init!(build_sizes_multiple_contracts_json, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.add_source(
         "Foo",
         r"

crates/forge/tests/cli/cache.rs

@@ -16,6 +16,7 @@ forgetest!(can_list_specific_chain, |_prj, cmd| {
 });
 
 forgetest_init!(can_test_no_cache, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.clear_cache();
 
     cmd.args(["test", "--no-cache"]).assert_success();

crates/forge/tests/cli/cmd.rs

@@ -88,7 +88,6 @@ forgetest!(can_clean_non_existing, |prj, cmd| {
 
 // checks that `clean` doesn't output warnings
 forgetest_init!(can_clean_without_warnings, |prj, cmd| {
-    prj.wipe_contracts();
     prj.add_source(
         "Simple.sol",
         r#"
@@ -922,6 +921,7 @@ forgetest!(can_clean_hardhat, PathStyle::HardHat, |prj, cmd| {
 
 // checks that `clean` also works with the "out" value set in Config
 forgetest_init!(can_clean_config, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.update_config(|config| config.out = "custom-out".into());
     cmd.arg("build").assert_success().stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
@@ -940,6 +940,7 @@ Compiler run successful!
 
 // checks that `clean` removes fuzz and invariant cache dirs
 forgetest_init!(can_clean_test_cache, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.update_config(|config| {
         config.fuzz = FuzzConfig::new("cache/fuzz".into());
         config.invariant = InvariantConfig::new("cache/invariant".into());
@@ -960,6 +961,7 @@ forgetest_init!(can_clean_test_cache, |prj, cmd| {
 
 // checks that extra output works
 forgetest_init!(can_emit_extra_output, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.clear();
 
     cmd.args(["build", "--extra-output", "metadata"]).assert_success().stdout_eq(str![[r#"
@@ -992,6 +994,7 @@ Compiler run successful!
 
 // checks that extra output works
 forgetest_init!(can_emit_multiple_extra_output, |prj, cmd| {
+    prj.initialize_default_contracts();
     cmd.args([
         "build",
         "--extra-output",
@@ -2544,6 +2547,7 @@ Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
 
 // <https://github.com/foundry-rs/foundry/issues/9115>
 forgetest_init!(gas_report_with_fallback, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.add_test(
         "DelegateProxyTest.sol",
         r#"
@@ -2686,6 +2690,7 @@ Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
 
 // <https://github.com/foundry-rs/foundry/issues/9858>
 forgetest_init!(gas_report_fallback_with_calldata, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.add_test(
         "FallbackWithCalldataTest.sol",
         r#"
@@ -2784,6 +2789,7 @@ Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
 
 // <https://github.com/foundry-rs/foundry/issues/9300>
 forgetest_init!(gas_report_size_for_nested_create, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.add_test(
         "NestedDeployTest.sol",
         r#"
@@ -2927,6 +2933,7 @@ Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
 });
 
 forgetest_init!(can_use_absolute_imports, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.update_config(|config| {
         let remapping = prj.paths().libraries[0].join("myDependency");
         config.remappings = vec![
@@ -2972,6 +2979,7 @@ Compiler run successful!
 
 // <https://github.com/foundry-rs/foundry/issues/3440>
 forgetest_init!(can_use_absolute_imports_from_test_and_script, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.add_script(
         "IMyScript.sol",
         r"
@@ -3013,7 +3021,8 @@ Compiler run successful!
 });
 
 // checks `forge inspect <contract> irOptimized works
-forgetest_init!(can_inspect_ir_optimized, |_prj, cmd| {
+forgetest_init!(can_inspect_ir_optimized, |prj, cmd| {
+    prj.initialize_default_contracts();
     cmd.args(["inspect", TEMPLATE_CONTRACT, "irOptimized"]);
     cmd.assert_success().stdout_eq(str![[r#"
 /// @use-src 0:"src/Counter.sol"
@@ -3038,7 +3047,8 @@ object "Counter_21" {
 });
 
 // checks `forge inspect <contract> irOptimized works
-forgetest_init!(can_inspect_ir, |_prj, cmd| {
+forgetest_init!(can_inspect_ir, |prj, cmd| {
+    prj.initialize_default_contracts();
     cmd.args(["inspect", TEMPLATE_CONTRACT, "ir"]);
     cmd.assert_success().stdout_eq(str![[r#"
 
@@ -3064,6 +3074,7 @@ object "Counter_21" {
 
 // checks forge bind works correctly on the default project
 forgetest_init!(can_bind, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.clear();
 
     cmd.arg("bind").assert_success().stdout_eq(str![[r#"
@@ -3078,6 +3089,7 @@ Bindings have been generated to [..]
 
 // checks that extra output works
 forgetest_init!(can_build_skip_contracts, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.clear();
 
     // Only builds the single template contract `src/*`
@@ -3098,6 +3110,7 @@ No files changed, compilation skipped
 });
 
 forgetest_init!(can_build_skip_glob, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.add_test(
         "Foo",
         r"
@@ -3128,8 +3141,7 @@ Compiler run successful!
 "#]]);
 });
 
-forgetest_init!(can_build_specific_paths, |prj, cmd| {
-    prj.wipe();
+forgetest!(can_build_specific_paths, |prj, cmd| {
     prj.add_source(
         "Counter.sol",
         r"
@@ -3202,6 +3214,7 @@ Error: No source files found in specified build paths.
 
 // checks that build --sizes includes all contracts even if unchanged
 forgetest_init!(can_build_sizes_repeatedly, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.clear_cache();
 
     cmd.args(["build", "--sizes"]).assert_success().stdout_eq(str![[r#"
@@ -3241,6 +3254,7 @@ forgetest_init!(can_build_sizes_repeatedly, |prj, cmd| {
 
 // checks that build --names includes all contracts even if unchanged
 forgetest_init!(can_build_names_repeatedly, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.clear_cache();
 
     cmd.args(["build", "--names"]).assert_success().stdout_eq(str![[r#"
@@ -3260,6 +3274,7 @@ Compiler run successful!
 });
 
 forgetest_init!(can_inspect_counter_pretty, |prj, cmd| {
+    prj.initialize_default_contracts();
     cmd.args(["inspect", "src/Counter.sol:Counter", "abi"]).assert_success().stdout_eq(str![[r#"
 
 ╭----------+---------------------------------+------------╮
@@ -3555,6 +3570,7 @@ forgetest!(inspect_custom_counter_very_huge_method_identifiers_unwrapped, |prj,
 });
 
 forgetest_init!(can_inspect_standard_json, |prj, cmd| {
+    prj.initialize_default_contracts();
     cmd.args(["inspect", "src/Counter.sol:Counter", "standard-json"]).assert_success().stdout_eq(str![[r#"
 {
   "language": "Solidity",
@@ -3602,6 +3618,7 @@ forgetest_init!(can_inspect_standard_json, |prj, cmd| {
 });
 
 forgetest_init!(can_inspect_libraries, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.add_source(
         "Source.sol",
         r#"
@@ -3638,6 +3655,7 @@ Dynamically linked libraries:
 
 // checks that `clean` also works with the "out" value set in Config
 forgetest_init!(gas_report_include_tests, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.update_config(|config| {
         config.gas_reports_include_tests = true;
         config.fuzz.runs = 1;
@@ -3821,6 +3839,7 @@ contract FooBarTest is DSTest {
 
 // <https://github.com/foundry-rs/foundry/issues/5847>
 forgetest_init!(can_bind_enum_modules, |prj, cmd| {
+    prj.initialize_default_contracts();
     prj.clear();
 
     prj.add_source(
@@ -3852,7 +3871,10 @@ Bindings have been generated to [..]"#
 
 // forge bind e2e
 forgetest_init!(can_bind_e2e, |prj, cmd| {
-    cmd.args(["bind"]).assert_success().stdout_eq(str![[r#"No files changed, compilation skipped
+    prj.initialize_default_contracts();
+    cmd.args(["bind"]).assert_success().stdout_eq(str![[r#"[COMPILING_FILES] with [SOLC_VERSION]
+[SOLC_VERSION] [ELAPSED]
+Compiler run successful!
 Generating bindings for 2 contracts
 Bindings have been generated to [..]"#]]);
 
@@ -3864,7 +3886,6 @@ Bindings have been generated to [..]"#]]);
         .current_dir(&bindings_path)
         .output()
         .expect("Failed to run cargo build");
-    // RUn `cargo build`
 
     assert!(out.status.success(), "Cargo build should succeed");
 });