Skip to content

Commit 34cd77c

Browse files
ddoktorskiddoktorski
committed
Migrate gas report tests to use insta 
1 parent 6a477e8 commit 34cd77c

File tree

11 files changed

+137
-118
lines changed

11 files changed

+137
-118
lines changed

‎Cargo.lock‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,4 @@ tracing = "0.1.41"
131131
tracing-chrome = "0.7.2"
132132
tracing-log = "0.2.0"
133133
comfy-table = "7"
134+
insta = { version = "1.43.1", features = ["filters"] }

‎crates/forge/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ cairo-lang-starknet-classes.workspace = true
7070
walkdir.workspace = true
7171
test-case.workspace = true
7272
itertools.workspace = true
73+
insta.workspace = true
7374
docs = { workspace = true, features = ["testing"] }
7475
packages_validation = { path = "../testing/packages_validation" }
7576
project-root.workspace = true

‎crates/forge/tests/e2e/common/mod.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use cairo_annotations::trace_data::{
33
CallTraceNode as ProfilerCallTraceNode, CallTraceV1 as ProfilerCallTrace,
44
};
55

6+
mod output;
67
pub mod runner;
78

89
#[cfg(not(feature = "cairo-native"))]

‎crates/forge/tests/e2e/common/output.rs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/// Asserts a cleaned `stdout` snapshot using `insta`, filtered for non-deterministic lines.
2+
/// Uses the current Scarb version as a snapshot suffix.
3+
#[macro_export]
4+
macro_rules! assert_cleaned_output {
5+
($output:expr) => {{
6+
let stdout = String::from_utf8_lossy(&$output.get_output().stdout);
7+
8+
let scarb_version = scarb_api::ScarbCommand::version()
9+
.run()
10+
.expect("Failed to get scarb version")
11+
.scarb;
12+
13+
insta::with_settings!({
14+
snapshot_suffix => scarb_version.to_string(),
15+
filters => vec![
16+
(r"(?m)^\s*(Compiling|Finished|Blocking).*", ""), // scarb output
17+
(r"(?m)^\s*(Collected|Running|Tests:|Latest block number).*", ""), // snforge output
18+
]},
19+
{
20+
insta::assert_snapshot!(stdout);
21+
}
22+
);
23+
}};
24+
}

‎crates/forge/tests/e2e/gas_report.rs‎

Lines changed: 7 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1+
use crate::assert_cleaned_output;
12
use crate::e2e::common::runner::{
23
BASE_FILE_PATTERNS, Package, setup_package, setup_package_with_file_patterns, test_runner,
34
};
4-
use indoc::indoc;
5-
use shared::test_utils::output_assert::assert_stdout_contains;
65

76
#[test]
87
fn basic() {
@@ -13,66 +12,19 @@ fn basic() {
1312
.assert()
1413
.code(0);
1514

16-
assert_stdout_contains(
17-
output,
18-
indoc! {r"
19-
[..]Compiling[..]
20-
[..]Finished[..]
21-
22-
23-
Collected 1 test(s) from simple_package package
24-
Running 0 test(s) from src/
25-
Running 1 test(s) from tests/
26-
[PASS] simple_package_integrationtest::contract::call_and_invoke (l1_gas: ~0, l1_data_gas: ~[..], l2_gas: ~[..])
27-
╭------------------------+-------+-------+-------+---------+---------╮
28-
| HelloStarknet Contract | | | | | |
29-
+====================================================================+
30-
| Function Name | Min | Max | Avg | Std Dev | # Calls |
31-
|------------------------+-------+-------+-------+---------+---------|
32-
| get_balance | 13340 | 13340 | 13340 | 0 | 2 |
33-
|------------------------+-------+-------+-------+---------+---------|
34-
| increase_balance | 24940 | 24940 | 24940 | 0 | 1 |
35-
╰------------------------+-------+-------+-------+---------+---------╯
36-
37-
Tests: 1 passed, 0 failed, 0 ignored, [..] filtered out
38-
"},
39-
);
15+
assert_cleaned_output!(output);
4016
}
4117

4218
#[test]
4319
fn recursive_calls() {
4420
let temp = setup_package("debugging");
45-
4621
let output = test_runner(&temp)
47-
.arg("test_debugging_trace_success")
4822
.arg("--gas-report")
23+
.arg("test_debugging_trace_success")
4924
.assert()
5025
.code(0);
5126

52-
assert_stdout_contains(
53-
output,
54-
indoc! {r"
55-
[..]Compiling[..]
56-
[..]Finished[..]
57-
58-
59-
Collected 1 test(s) from debugging package
60-
Running 0 test(s) from src/
61-
Running 1 test(s) from tests/
62-
[PASS] debugging_integrationtest::test_trace::test_debugging_trace_success (l1_gas: ~0, l1_data_gas: ~[..], l2_gas: ~[..])
63-
╭-------------------------+-------+--------+--------+---------+---------╮
64-
| SimpleContract Contract | | | | | |
65-
+=======================================================================+
66-
| Function Name | Min | Max | Avg | Std Dev | # Calls |
67-
|-------------------------+-------+--------+--------+---------+---------|
68-
| execute_calls | 11680 | 609080 | 183924 | 235859 | 5 |
69-
|-------------------------+-------+--------+--------+---------+---------|
70-
| fail | 17950 | 17950 | 17950 | 0 | 1 |
71-
╰-------------------------+-------+--------+--------+---------+---------╯
72-
73-
Tests: 1 passed, 0 failed, 0 ignored, [..] filtered out
74-
"},
75-
);
27+
assert_cleaned_output!(output);
7628
}
7729

7830
#[test]
@@ -84,38 +36,7 @@ fn multiple_contracts_and_constructor() {
8436
.assert()
8537
.code(0);
8638

87-
assert_stdout_contains(
88-
output,
89-
indoc! {r"
90-
[..]Compiling[..]
91-
[..]Finished[..]
92-
93-
94-
Collected 1 test(s) from simple_package_with_cheats package
95-
Running 0 test(s) from src/
96-
Running 1 test(s) from tests/
97-
[PASS] simple_package_with_cheats_integrationtest::contract::call_and_invoke_proxy (l1_gas: ~0, l1_data_gas: ~[..], l2_gas: ~[..])
98-
╭------------------------+-------+-------+-------+---------+---------╮
99-
| HelloStarknet Contract | | | | | |
100-
+====================================================================+
101-
| Function Name | Min | Max | Avg | Std Dev | # Calls |
102-
|------------------------+-------+-------+-------+---------+---------|
103-
| get_block_number | 15780 | 15780 | 15780 | 0 | 2 |
104-
╰------------------------+-------+-------+-------+---------+---------╯
105-
106-
╭-----------------------------+--------+--------+--------+---------+---------╮
107-
| HelloStarknetProxy Contract | | | | | |
108-
+============================================================================+
109-
| Function Name | Min | Max | Avg | Std Dev | # Calls |
110-
|-----------------------------+--------+--------+--------+---------+---------|
111-
| constructor | 14650 | 14650 | 14650 | 0 | 1 |
112-
|-----------------------------+--------+--------+--------+---------+---------|
113-
| get_block_number | 125280 | 125280 | 125280 | 0 | 2 |
114-
╰-----------------------------+--------+--------+--------+---------+---------╯
115-
116-
Tests: 1 passed, 0 failed, 0 ignored, [..] filtered out
117-
"},
118-
);
39+
assert_cleaned_output!(output);
11940
}
12041

12142
#[test]
@@ -124,44 +45,12 @@ fn fork() {
12445
setup_package_with_file_patterns(Package::Name("forking".to_string()), BASE_FILE_PATTERNS);
12546

12647
let output = test_runner(&temp)
127-
.arg("test_track_resources")
12848
.arg("--gas-report")
49+
.arg("test_track_resources")
12950
.assert()
13051
.code(0);
13152

132-
assert_stdout_contains(
133-
output,
134-
indoc! {r"
135-
[..]Compiling[..]
136-
[..]Finished[..]
137-
138-
Collected 1 test(s) from forking package
139-
Running 1 test(s) from src/
140-
[PASS] forking::tests::test_track_resources (l1_gas: ~0, l1_data_gas: ~[..], l2_gas: ~[..])
141-
╭---------------------------+-------+-------+-------+---------+---------╮
142-
| forked contract | | | | | |
143-
| (class hash: 0x06a7…1550) | | | | | |
144-
+=======================================================================+
145-
| Function Name | Min | Max | Avg | Std Dev | # Calls |
146-
|---------------------------+-------+-------+-------+---------+---------|
147-
| get_balance | 40000 | 40000 | 40000 | 0 | 1 |
148-
|---------------------------+-------+-------+-------+---------+---------|
149-
| increase_balance | 40000 | 40000 | 40000 | 0 | 1 |
150-
╰---------------------------+-------+-------+-------+---------+---------╯
151-
╭---------------------------+-------+-------+-------+---------+---------╮
152-
| forked contract | | | | | |
153-
| (class hash: 0x07aa…af4b) | | | | | |
154-
+=======================================================================+
155-
| Function Name | Min | Max | Avg | Std Dev | # Calls |
156-
|---------------------------+-------+-------+-------+---------+---------|
157-
| get_balance | 13840 | 13840 | 13840 | 0 | 1 |
158-
|---------------------------+-------+-------+-------+---------+---------|
159-
| increase_balance | 25840 | 25840 | 25840 | 0 | 1 |
160-
╰---------------------------+-------+-------+-------+---------+---------╯
161-
162-
Tests: 1 passed, 0 failed, 0 ignored, [..] filtered out
163-
"},
164-
);
53+
assert_cleaned_output!(output);
16554
}
16655

16756
#[test]

‎crates/forge/tests/e2e/snapshots/[email protected]‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
source: crates/forge/tests/e2e/gas_report.rs
3+
expression: stdout
4+
---
5+
[PASS] simple_package_integrationtest::contract::call_and_invoke (l1_gas: ~0, l1_data_gas: ~192, l2_gas: ~510880)
6+
╭------------------------+-------+-------+-------+---------+---------╮
7+
| HelloStarknet Contract | | | | | |
8+
+====================================================================+
9+
| Function Name | Min | Max | Avg | Std Dev | # Calls |
10+
|------------------------+-------+-------+-------+---------+---------|
11+
| get_balance | 13340 | 13340 | 13340 | 0 | 2 |
12+
|------------------------+-------+-------+-------+---------+---------|
13+
| increase_balance | 24940 | 24940 | 24940 | 0 | 1 |
14+
╰------------------------+-------+-------+-------+---------+---------╯

‎crates/forge/tests/e2e/snapshots/[email protected]‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
source: crates/forge/tests/e2e/gas_report.rs
3+
expression: stdout
4+
---
5+
[PASS] simple_package_integrationtest::contract::call_and_invoke (l1_gas: ~0, l1_data_gas: ~192, l2_gas: ~510880)
6+
╭------------------------+-------+-------+-------+---------+---------╮
7+
| HelloStarknet Contract | | | | | |
8+
+====================================================================+
9+
| Function Name | Min | Max | Avg | Std Dev | # Calls |
10+
|------------------------+-------+-------+-------+---------+---------|
11+
| get_balance | 13340 | 13340 | 13340 | 0 | 2 |
12+
|------------------------+-------+-------+-------+---------+---------|
13+
| increase_balance | 24940 | 24940 | 24940 | 0 | 1 |
14+
╰------------------------+-------+-------+-------+---------+---------╯

‎crates/forge/tests/e2e/snapshots/[email protected]‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
source: crates/forge/tests/e2e/gas_report.rs
3+
expression: stdout
4+
---
5+
[PASS] forking::tests::test_track_resources (l1_gas: ~0, l1_data_gas: ~320, l2_gas: ~509780)
6+
╭-------------------------+-------+-------+-------+---------+---------╮
7+
| forked contract | | | | | |
8+
| (class hash: 0x06…1550) | | | | | |
9+
+=====================================================================+
10+
| Function Name | Min | Max | Avg | Std Dev | # Calls |
11+
|-------------------------+-------+-------+-------+---------+---------|
12+
| get_balance | 40000 | 40000 | 40000 | 0 | 1 |
13+
|-------------------------+-------+-------+-------+---------+---------|
14+
| increase_balance | 40000 | 40000 | 40000 | 0 | 1 |
15+
╰-------------------------+-------+-------+-------+---------+---------╯
16+
17+
╭-------------------------+-------+-------+-------+---------+---------╮
18+
| forked contract | | | | | |
19+
| (class hash: 0x07…af4b) | | | | | |
20+
+=====================================================================+
21+
| Function Name | Min | Max | Avg | Std Dev | # Calls |
22+
|-------------------------+-------+-------+-------+---------+---------|
23+
| get_balance | 13840 | 13840 | 13840 | 0 | 1 |
24+
|-------------------------+-------+-------+-------+---------+---------|
25+
| increase_balance | 25840 | 25840 | 25840 | 0 | 1 |
26+
╰-------------------------+-------+-------+-------+---------+---------╯

‎crates/forge/tests/e2e/snapshots/main__e2e__gas_report__multiple_contracts_and_constructor@2.12.1.snap‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
source: crates/forge/tests/e2e/gas_report.rs
3+
expression: stdout
4+
---
5+
[PASS] simple_package_with_cheats_integrationtest::contract::call_and_invoke_proxy (l1_gas: ~0, l1_data_gas: ~288, l2_gas: ~868670)
6+
╭------------------------+-------+-------+-------+---------+---------╮
7+
| HelloStarknet Contract | | | | | |
8+
+====================================================================+
9+
| Function Name | Min | Max | Avg | Std Dev | # Calls |
10+
|------------------------+-------+-------+-------+---------+---------|
11+
| get_block_number | 15780 | 15780 | 15780 | 0 | 2 |
12+
╰------------------------+-------+-------+-------+---------+---------╯
13+
14+
╭-----------------------------+--------+--------+--------+---------+---------╮
15+
| HelloStarknetProxy Contract | | | | | |
16+
+============================================================================+
17+
| Function Name | Min | Max | Avg | Std Dev | # Calls |
18+
|-----------------------------+--------+--------+--------+---------+---------|
19+
| constructor | 14650 | 14650 | 14650 | 0 | 1 |
20+
|-----------------------------+--------+--------+--------+---------+---------|
21+
| get_block_number | 125280 | 125280 | 125280 | 0 | 2 |
22+
╰-----------------------------+--------+--------+--------+---------+---------╯

0 commit comments

Comments
 (0)