Skip to content

refactor: simplify gas snapshot handling in cheatcodes #12605

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
Nov 19, 2025
Merged

refactor: simplify gas snapshot handling in cheatcodes #12605

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
10 changes: 4 additions & 6 deletions crates/cheatcodes/src/evm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,8 +1214,7 @@ fn inner_start_gas_snapshot(
name: Option<String>,
) -> Result {
// Revert if there is an active gas snapshot as we can only have one active snapshot at a time.
if ccx.state.gas_metering.active_gas_snapshot.is_some() {
let (group, name) = ccx.state.gas_metering.active_gas_snapshot.as_ref().unwrap().clone();
if let Some((group, name)) = &ccx.state.gas_metering.active_gas_snapshot {
bail!("gas snapshot was already started with group: {group} and name: {name}");
}

Expand All @@ -1241,10 +1240,9 @@ fn inner_stop_gas_snapshot(
name: Option<String>,
) -> Result {
// If group and name are not provided, use the last snapshot group and name.
let (group, name) = group.zip(name).unwrap_or_else(|| {
let (group, name) = ccx.state.gas_metering.active_gas_snapshot.as_ref().unwrap().clone();
(group, name)
});
let (group, name) = group
.zip(name)
.unwrap_or_else(|| ccx.state.gas_metering.active_gas_snapshot.clone().unwrap());

if let Some(record) = ccx
.state
Expand Down
Loading