Skip to content

Commit 5390c66

Browse files
committed
feat(forge/script): apply changes from review
Signed-off-by: 0xpanoramix <[email protected]>
1 parent 1526710 commit 5390c66

File tree

2 files changed

+5
-17
lines changed

2 files changed

+5
-17
lines changed

crates/script/src/execute.rs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -387,32 +387,20 @@ impl ExecutedState {
387387

388388
impl PreSimulationState {
389389
pub async fn show_json(&self) -> Result<()> {
390-
let result = &self.execution_result;
390+
let result = &mut self.execution_result.clone();
391391
let decoder = &self.execution_artifacts.decoder;
392-
let mut traces = result.traces.clone();
393392

394-
for (_, trace) in &mut traces {
393+
for (_, trace) in &mut result.traces {
395394
decode_trace_arena(trace, decoder).await?;
396395
}
397396

398-
let result_with_decoded_traces = &ScriptResult {
399-
success: result.success,
400-
gas_used: result.gas_used,
401-
logs: result.logs.clone(),
402-
traces,
403-
labeled_addresses: result.labeled_addresses.clone(),
404-
returned: result.returned.clone(),
405-
transactions: result.transactions.clone(),
406-
breakpoints: result.breakpoints.clone(),
407-
address: result.address,
408-
};
409-
410397
let json_result = JsonResult {
411398
logs: decode_console_logs(&result.logs),
412399
returns: &self.execution_artifacts.returns,
413-
result: result_with_decoded_traces,
400+
result,
414401
};
415402
let json = serde_json::to_string(&json_result)?;
403+
416404
sh_println!("{json}")?;
417405

418406
if !self.execution_result.success {

crates/script/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ impl Provider for ScriptArgs {
499499
}
500500
}
501501

502-
#[derive(Default, Serialize)]
502+
#[derive(Default, Serialize, Clone)]
503503
pub struct ScriptResult {
504504
pub success: bool,
505505
#[serde(rename = "raw_logs")]

0 commit comments

Comments
 (0)