Create ContractsDataStore only once

Author: ddoktorski

crates/debugging/src/contracts_data_store.rs

@@ -14,6 +14,7 @@ use std::hash::Hash;
 
 /// Data structure containing information about contracts,
 /// including their ABI, names, selectors and programs that will be used to create a [`Trace`](crate::Trace).
+#[derive(Clone)]
 pub struct ContractsDataStore {
     abi: HashMap<ClassHash, Vec<AbiEntry>>,
     contract_names: HashMap<ClassHash, ContractName>,

crates/debugging/src/trace/context.rs

@@ -1,7 +1,5 @@
 use crate::Components;
 use crate::contracts_data_store::ContractsDataStore;
-use cheatnet::forking::data::ForkData;
-use cheatnet::runtime_extensions::forge_runtime_extension::contracts_data::ContractsData;
 
 /// Context is a structure that holds the necessary data for creating a [`Trace`](crate::Trace).
 pub struct Context {
@@ -12,12 +10,7 @@ pub struct Context {
 impl Context {
     /// Creates a new instance of [`Context`] from a given `cheatnet` [`ContractsData`], [`ForkData`] and [`Components`].
     #[must_use]
-    pub fn new(
-        contracts_data: &ContractsData,
-        fork_data: &ForkData,
-        components: Components,
-    ) -> Self {
-        let contracts_data_store = ContractsDataStore::new(contracts_data, fork_data);
+    pub fn new(contracts_data_store: ContractsDataStore, components: Components) -> Self {
         Self {
             contracts_data_store,
             components,

crates/forge-runner/src/debugging/mod.rs

@@ -2,22 +2,20 @@ mod args;
 mod component;
 mod trace_verbosity;
 
-use cheatnet::forking::data::ForkData;
-use cheatnet::runtime_extensions::forge_runtime_extension::contracts_data::ContractsData;
 use cheatnet::trace_data::CallTrace;
 
 pub use args::TraceArgs;
+use debugging::ContractsDataStore;
 pub use trace_verbosity::TraceVerbosity;
 
 #[must_use]
 pub fn build_debugging_trace(
     call_trace: &CallTrace,
-    contracts_data: &ContractsData,
+    contracts_data_store: &ContractsDataStore,
     trace_args: &TraceArgs,
     test_name: String,
-    fork_data: &ForkData,
 ) -> Option<debugging::Trace> {
     let components = trace_args.to_components()?;
-    let context = debugging::Context::new(contracts_data, fork_data, components);
+    let context = debugging::Context::new(contracts_data_store.clone(), components);
     Some(debugging::Trace::new(call_trace, &context, test_name))
 }

crates/forge-runner/src/running.rs

@@ -30,6 +30,7 @@ use cheatnet::runtime_extensions::forge_runtime_extension::{
 };
 use cheatnet::state::{BlockInfoReader, CheatnetState, EncounteredErrors, ExtendedStateReader};
 use cheatnet::trace_data::CallTrace;
+use debugging::ContractsDataStore;
 use execution::finalize_execution;
 use hints::hints_by_representation;
 use rand::prelude::StdRng;
@@ -435,10 +436,9 @@ fn extract_test_case_summary(
                     test_statistics: (),
                     debugging_trace: build_debugging_trace(
                         &run_error.call_trace.borrow(),
-                        contracts_data,
+                        &ContractsDataStore::new(contracts_data, &run_error.fork_data),
                         trace_args,
                         case.name.clone(),
-                        &run_error.fork_data,
                     ),
                 }
             }

crates/forge-runner/src/test_case_summary.rs

@@ -294,19 +294,19 @@ impl TestCaseSummary<Single> {
     ) -> Self {
         let name = test_case.name.clone();
 
+        let contracts_data_store = ContractsDataStore::new(contracts_data, &fork_data);
         let debugging_trace = build_debugging_trace(
             &call_trace.borrow(),
-            contracts_data,
+            &contracts_data_store,
             trace_args,
             name.clone(),
-            &fork_data,
         );
 
         let gas_info = SingleTestGasInfo::new(gas_used);
         let gas_info = if gas_report_enabled {
             gas_info.get_with_report_data(
                 &call_trace.borrow(),
-                &ContractsDataStore::new(contracts_data, &fork_data),
+                &contracts_data_store,
             )
         } else {
             gas_info