Skip to content

Commit aa4f1e8

Browse files
committed
Use ArchivalDataResources from blockifier
commit-id:019be9ea
1 parent eb32a5e commit aa4f1e8

File tree

1 file changed

+9
-24
lines changed

1 file changed

+9
-24
lines changed

crates/forge-runner/src/gas.rs

+9-24
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::test_case_summary::{Single, TestCaseSummary};
22
use anyhow::anyhow;
33
use blockifier::abi::constants;
44
use blockifier::context::TransactionContext;
5-
use blockifier::execution::call_info::{ChargedResources, EventSummary, ExecutionSummary};
5+
use blockifier::execution::call_info::EventSummary;
66
use blockifier::fee::resources::{
77
ArchivalDataResources, ComputationResources, MessageResources, StarknetResources,
88
StateResources, TransactionResources,
@@ -18,7 +18,6 @@ use shared::print::print_as_warning;
1818
use starknet_api::execution_resources::{GasAmount, GasVector};
1919
use starknet_api::transaction::EventContent;
2020
use starknet_api::transaction::fields::GasVectorComputationMode;
21-
use std::collections::HashSet;
2221

2322
pub fn calculate_used_gas(
2423
transaction_context: &TransactionContext,
@@ -72,29 +71,15 @@ fn get_archival_data_resources(events: Vec<EventContent>) -> ArchivalDataResourc
7271
event_summary.total_event_keys += u64_from_usize(event.keys.len());
7372
}
7473

75-
// TODO(#2978) this is a workaround because we cannot create `ArchivalDataResources` directly yet
76-
// because of private fields
77-
let dummy_execution_summary = ExecutionSummary {
78-
charged_resources: ChargedResources::default(),
79-
executed_class_hashes: HashSet::default(),
80-
visited_storage_entries: HashSet::default(),
81-
l2_to_l1_payload_lengths: vec![],
74+
// calldata length, signature length and code size are set to 0, because
75+
// we don't include them in estimations
76+
// ref: https://github.com/foundry-rs/starknet-foundry/blob/5ce15b029135545452588c00aae580c05eb11ca8/docs/src/testing/gas-and-resource-estimation.md?plain=1#L73
77+
ArchivalDataResources {
8278
event_summary,
83-
};
84-
85-
let dummy_starknet_resources = StarknetResources::new(
86-
// calldata length, signature length and code size are set to 0, because
87-
// we don't include them in estimations
88-
// ref: https://github.com/foundry-rs/starknet-foundry/blob/5ce15b029135545452588c00aae580c05eb11ca8/docs/src/testing/gas-and-resource-estimation.md?plain=1#L73
89-
0,
90-
0,
91-
0,
92-
StateResources::default(),
93-
None,
94-
dummy_execution_summary,
95-
);
96-
97-
dummy_starknet_resources.archival_data
79+
calldata_length: 0,
80+
signature_length: 0,
81+
code_size: 0,
82+
}
9883
}
9984

10085
// Put together from a few blockifier functions

0 commit comments

Comments
 (0)