Skip to content

chore(test-utils): TestProject::add_* internal unwrap() #11467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2025
Merged

chore(test-utils): TestProject::add_* internal unwrap() #11467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 13 additions & 26 deletions crates/cast/tests/cli/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2528,8 +2528,7 @@ contract LocalProjectContract {
}
}
"#,
)
.unwrap();
);
prj.add_script(
"LocalProjectScript",
r#"
Expand All @@ -2544,8 +2543,7 @@ contract LocalProjectScript is Script {
}
}
"#,
)
.unwrap();
);

cmd.args([
"script",
Expand Down Expand Up @@ -2696,8 +2694,7 @@ library ExternalLib {
}
}
"#,
)
.unwrap();
);
prj.add_source(
"CounterInExternalLib",
r#"
Expand All @@ -2712,8 +2709,7 @@ contract CounterInExternalLib {
}
}
"#,
)
.unwrap();
);
prj.add_script(
"CounterInExternalLibScript",
r#"
Expand All @@ -2727,8 +2723,7 @@ contract CounterInExternalLibScript is Script {
}
}
"#,
)
.unwrap();
);

cmd.args([
"script",
Expand Down Expand Up @@ -2805,8 +2800,7 @@ contract Counter {
}
}
"#,
)
.unwrap();
);

// Deploy counter contract.
cmd.args([
Expand Down Expand Up @@ -2907,8 +2901,7 @@ contract Counter {
}
}
"#,
)
.unwrap();
);

// Deploy counter contract.
cmd.args([
Expand Down Expand Up @@ -3327,8 +3320,7 @@ contract SimpleStorage {
}
}
"#,
)
.unwrap();
);
prj.add_script(
"SimpleStorageScript",
r#"
Expand All @@ -3342,8 +3334,7 @@ contract SimpleStorageScript is Script {
}
}
"#,
)
.unwrap();
);

cmd.args([
"script",
Expand Down Expand Up @@ -3464,8 +3455,7 @@ contract ConstructorContract {
}
}
"#,
)
.unwrap();
);

// Compile to get bytecode
cmd.forge_fuse().args(["build"]).assert_success();
Expand Down Expand Up @@ -3540,8 +3530,7 @@ contract EstimateContract {
}
}
"#,
)
.unwrap();
);

// Compile to get bytecode
cmd.forge_fuse().args(["build"]).assert_success();
Expand Down Expand Up @@ -3590,8 +3579,7 @@ contract SimpleContract {
uint256 public constant VALUE = 42;
}
"#,
)
.unwrap();
);

// Compile
cmd.forge_fuse().args(["build"]).assert_success();
Expand Down Expand Up @@ -3649,8 +3637,7 @@ contract ComplexContract {
}
}
"#,
)
.unwrap();
);

// Compile
cmd.forge_fuse().args(["build"]).assert_success();
Expand Down
3 changes: 1 addition & 2 deletions crates/cast/tests/cli/selectors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@ contract ContractWithCustomError {
event MyUniqueEventWithinLocalProject(uint256 a, address b);
}
"#,
)
.unwrap();
);
// Store selectors in local cache.
cmd.forge_fuse().args(["selectors", "cache"]).assert_success();

Expand Down
3 changes: 1 addition & 2 deletions crates/forge/tests/cli/bind_json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ contract BindJsonTest is Test {
}
}
"#,
)
.unwrap();
);

cmd.arg("bind-json").assert_success();

Expand Down
35 changes: 12 additions & 23 deletions crates/forge/tests/cli/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ contract Dummy {
}
}
",
)
.unwrap();
);

// set up command
cmd.args(["compile", "--format-json"]).assert_success().stderr_eq("").stdout_eq(str![[r#"
Expand Down Expand Up @@ -71,7 +70,7 @@ contract Dummy {
});

forgetest!(initcode_size_exceeds_limit, |prj, cmd| {
prj.add_source("LargeContract.sol", generate_large_init_contract(50_000).as_str()).unwrap();
prj.add_source("LargeContract.sol", generate_large_init_contract(50_000).as_str());
cmd.args(["build", "--sizes"]).assert_failure().stdout_eq(str![[r#"
[COMPILING_FILES] with [SOLC_VERSION]
[SOLC_VERSION] [ELAPSED]
Expand Down Expand Up @@ -185,8 +184,7 @@ forgetest_init!(build_sizes_multiple_contracts, |prj, cmd| {
contract Foo {
}
",
)
.unwrap();
);

prj.add_source(
"a/Counter",
Expand All @@ -198,8 +196,7 @@ contract Counter {
}
}
",
)
.unwrap();
);

prj.add_source(
"b/Counter",
Expand All @@ -211,8 +208,7 @@ contract Counter {
}
}
",
)
.unwrap();
);

cmd.args(["build", "--sizes"]).assert_success().stdout_eq(str![[r#"
...
Expand Down Expand Up @@ -241,8 +237,7 @@ forgetest_init!(build_sizes_multiple_contracts_json, |prj, cmd| {
contract Foo {
}
",
)
.unwrap();
);

prj.add_source(
"a/Counter",
Expand All @@ -254,8 +249,7 @@ contract Counter {
}
}
",
)
.unwrap();
);

prj.add_source(
"b/Counter",
Expand All @@ -267,8 +261,7 @@ contract Counter {
}
}
",
)
.unwrap();
);

cmd.args(["build", "--sizes", "--json"]).assert_success().stdout_eq(
str![[r#"
Expand Down Expand Up @@ -312,16 +305,14 @@ contract InvalidContract {
some_invalid_syntax
}
",
)
.unwrap();
);

prj.add_source(
"ValidContract",
r"
contract ValidContract {}
",
)
.unwrap();
);

prj.update_config(|config| {
config.skip = vec![Glob::new("src/InvalidContract.sol").unwrap().into()];
Expand All @@ -339,8 +330,7 @@ import {B} from "/badpath/B.sol";

contract A is B {}
"#,
)
.unwrap();
);

prj.add_source(
"CContract.sol",
Expand All @@ -349,8 +339,7 @@ import {B} from "badpath/B.sol";

contract C is B {}
"#,
)
.unwrap();
);

cmd.args(["build", "src/AContract.sol"]).assert_failure().stdout_eq(str![[r#"
...
Expand Down
Loading
Loading