Skip to content

Commit c771e5c

Browse files
mablrmablr
authored
chore(test-utils): TestProject::add_* internal unwrap() (#11467)
1 parent e6098ac commit c771e5c

28 files changed

+547
-929
lines changed

‎crates/cast/tests/cli/main.rs‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2528,8 +2528,7 @@ contract LocalProjectContract {
25282528
}
25292529
}
25302530
"#,
2531-
)
2532-
.unwrap();
2531+
);
25332532
prj.add_script(
25342533
"LocalProjectScript",
25352534
r#"
@@ -2544,8 +2543,7 @@ contract LocalProjectScript is Script {
25442543
}
25452544
}
25462545
"#,
2547-
)
2548-
.unwrap();
2546+
);
25492547

25502548
cmd.args([
25512549
"script",
@@ -2696,8 +2694,7 @@ library ExternalLib {
26962694
}
26972695
}
26982696
"#,
2699-
)
2700-
.unwrap();
2697+
);
27012698
prj.add_source(
27022699
"CounterInExternalLib",
27032700
r#"
@@ -2712,8 +2709,7 @@ contract CounterInExternalLib {
27122709
}
27132710
}
27142711
"#,
2715-
)
2716-
.unwrap();
2712+
);
27172713
prj.add_script(
27182714
"CounterInExternalLibScript",
27192715
r#"
@@ -2727,8 +2723,7 @@ contract CounterInExternalLibScript is Script {
27272723
}
27282724
}
27292725
"#,
2730-
)
2731-
.unwrap();
2726+
);
27322727

27332728
cmd.args([
27342729
"script",
@@ -2805,8 +2800,7 @@ contract Counter {
28052800
}
28062801
}
28072802
"#,
2808-
)
2809-
.unwrap();
2803+
);
28102804

28112805
// Deploy counter contract.
28122806
cmd.args([
@@ -2907,8 +2901,7 @@ contract Counter {
29072901
}
29082902
}
29092903
"#,
2910-
)
2911-
.unwrap();
2904+
);
29122905

29132906
// Deploy counter contract.
29142907
cmd.args([
@@ -3327,8 +3320,7 @@ contract SimpleStorage {
33273320
}
33283321
}
33293322
"#,
3330-
)
3331-
.unwrap();
3323+
);
33323324
prj.add_script(
33333325
"SimpleStorageScript",
33343326
r#"
@@ -3342,8 +3334,7 @@ contract SimpleStorageScript is Script {
33423334
}
33433335
}
33443336
"#,
3345-
)
3346-
.unwrap();
3337+
);
33473338

33483339
cmd.args([
33493340
"script",
@@ -3464,8 +3455,7 @@ contract ConstructorContract {
34643455
}
34653456
}
34663457
"#,
3467-
)
3468-
.unwrap();
3458+
);
34693459

34703460
// Compile to get bytecode
34713461
cmd.forge_fuse().args(["build"]).assert_success();
@@ -3540,8 +3530,7 @@ contract EstimateContract {
35403530
}
35413531
}
35423532
"#,
3543-
)
3544-
.unwrap();
3533+
);
35453534

35463535
// Compile to get bytecode
35473536
cmd.forge_fuse().args(["build"]).assert_success();
@@ -3590,8 +3579,7 @@ contract SimpleContract {
35903579
uint256 public constant VALUE = 42;
35913580
}
35923581
"#,
3593-
)
3594-
.unwrap();
3582+
);
35953583

35963584
// Compile
35973585
cmd.forge_fuse().args(["build"]).assert_success();
@@ -3649,8 +3637,7 @@ contract ComplexContract {
36493637
}
36503638
}
36513639
"#,
3652-
)
3653-
.unwrap();
3640+
);
36543641

36553642
// Compile
36563643
cmd.forge_fuse().args(["build"]).assert_success();

‎crates/cast/tests/cli/selectors.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@ contract ContractWithCustomError {
185185
event MyUniqueEventWithinLocalProject(uint256 a, address b);
186186
}
187187
"#,
188-
)
189-
.unwrap();
188+
);
190189
// Store selectors in local cache.
191190
cmd.forge_fuse().args(["selectors", "cache"]).assert_success();
192191

‎crates/forge/tests/cli/bind_json.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ contract BindJsonTest is Test {
4848
}
4949
}
5050
"#,
51-
)
52-
.unwrap();
51+
);
5352

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

‎crates/forge/tests/cli/build.rs‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ contract Dummy {
4242
}
4343
}
4444
",
45-
)
46-
.unwrap();
45+
);
4746

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

7372
forgetest!(initcode_size_exceeds_limit, |prj, cmd| {
74-
prj.add_source("LargeContract.sol", generate_large_init_contract(50_000).as_str()).unwrap();
73+
prj.add_source("LargeContract.sol", generate_large_init_contract(50_000).as_str());
7574
cmd.args(["build", "--sizes"]).assert_failure().stdout_eq(str![[r#"
7675
[COMPILING_FILES] with [SOLC_VERSION]
7776
[SOLC_VERSION] [ELAPSED]
@@ -185,8 +184,7 @@ forgetest_init!(build_sizes_multiple_contracts, |prj, cmd| {
185184
contract Foo {
186185
}
187186
",
188-
)
189-
.unwrap();
187+
);
190188

191189
prj.add_source(
192190
"a/Counter",
@@ -198,8 +196,7 @@ contract Counter {
198196
}
199197
}
200198
",
201-
)
202-
.unwrap();
199+
);
203200

204201
prj.add_source(
205202
"b/Counter",
@@ -211,8 +208,7 @@ contract Counter {
211208
}
212209
}
213210
",
214-
)
215-
.unwrap();
211+
);
216212

217213
cmd.args(["build", "--sizes"]).assert_success().stdout_eq(str![[r#"
218214
...
@@ -241,8 +237,7 @@ forgetest_init!(build_sizes_multiple_contracts_json, |prj, cmd| {
241237
contract Foo {
242238
}
243239
",
244-
)
245-
.unwrap();
240+
);
246241

247242
prj.add_source(
248243
"a/Counter",
@@ -254,8 +249,7 @@ contract Counter {
254249
}
255250
}
256251
",
257-
)
258-
.unwrap();
252+
);
259253

260254
prj.add_source(
261255
"b/Counter",
@@ -267,8 +261,7 @@ contract Counter {
267261
}
268262
}
269263
",
270-
)
271-
.unwrap();
264+
);
272265

273266
cmd.args(["build", "--sizes", "--json"]).assert_success().stdout_eq(
274267
str![[r#"
@@ -312,16 +305,14 @@ contract InvalidContract {
312305
some_invalid_syntax
313306
}
314307
",
315-
)
316-
.unwrap();
308+
);
317309

318310
prj.add_source(
319311
"ValidContract",
320312
r"
321313
contract ValidContract {}
322314
",
323-
)
324-
.unwrap();
315+
);
325316

326317
prj.update_config(|config| {
327318
config.skip = vec![Glob::new("src/InvalidContract.sol").unwrap().into()];
@@ -339,8 +330,7 @@ import {B} from "/badpath/B.sol";
339330
340331
contract A is B {}
341332
"#,
342-
)
343-
.unwrap();
333+
);
344334

345335
prj.add_source(
346336
"CContract.sol",
@@ -349,8 +339,7 @@ import {B} from "badpath/B.sol";
349339
350340
contract C is B {}
351341
"#,
352-
)
353-
.unwrap();
342+
);
354343

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

0 commit comments

Comments
 (0)