Make self-review

franciszekjob · franciszekjob · commit ea8f43a64049 · 2026-04-16T16:45:19.000+02:00
diff --git a/crates/cheatnet/src/predeployment/contracts_data.rs b/crates/cheatnet/src/predeployment/contracts_data.rs
@@ -4,7 +4,7 @@ use crate::{
     predeployment::erc20::strk::{STRK_CONTRACT_CLASS_HASH, STRK_CONTRACT_NAME},
     runtime_extensions::forge_runtime_extension::contracts_data::ContractsData,
 };
-use anyhow::Result;
+use anyhow::{Result, anyhow};
 use conversions::string::TryFromHexStr;
 
 pub fn load_predeployed_contracts() -> Result<ContractsData> {
@@ -27,12 +27,11 @@ pub fn load_predeployed_contracts() -> Result<ContractsData> {
             .class_hashes
             .insert(contract_name.clone(), class_hash);
 
-        // update contract data class hash
-        contracts_data
+        let contract_data = contracts_data
             .contracts
             .get_mut(&contract_name)
-            .expect("contract data for {contract_name} should exist")
-            .class_hash = class_hash;
+            .ok_or_else(|| anyhow!("contract data for {contract_name} should exist"))?;
+        contract_data.class_hash = class_hash;
     }
 
     Ok(contracts_data)
diff --git a/crates/cheatnet/src/predeployment/erc20/contracts_data.rs b/crates/cheatnet/src/predeployment/erc20/contracts_data.rs
@@ -1,54 +1,73 @@
 use std::{collections::HashMap, fs};
 
 use crate::predeployment::erc20::{eth::ETH_CONTRACT_NAME, strk::STRK_CONTRACT_NAME};
-use anyhow::Result;
+use anyhow::{Context, Result, anyhow};
 use camino::Utf8PathBuf;
 use scarb_api::StarknetContractArtifacts;
 
 pub fn load_erc20_predeployed_contracts()
 -> Result<HashMap<String, (StarknetContractArtifacts, Utf8PathBuf)>> {
+    let strk_sierra = include_str!("../../data/predeployed_contracts/STRK/sierra.json");
+    let eth_sierra = include_str!("../../data/predeployed_contracts/ETH/sierra.json");
+
     Ok(HashMap::from([
         (
             STRK_CONTRACT_NAME.to_string(),
             (
                 StarknetContractArtifacts {
-                    sierra: fs::read_to_string(concat!(
-                        env!("CARGO_MANIFEST_DIR"),
-                        "/src/data/predeployed_contracts/strk/sierra.json"
+                    sierra: strk_sierra.to_string(),
+                    casm: serde_json::from_str(include_str!(
+                        "../../data/predeployed_contracts/STRK/casm.json"
                     ))?,
-                    casm: serde_json::from_str(&fs::read_to_string(concat!(
-                        env!("CARGO_MANIFEST_DIR"),
-                        "/src/data/predeployed_contracts/strk/casm.json"
-                    ))?)?,
                     #[cfg(feature = "cairo-native")]
                     executor: None,
                 },
-                Utf8PathBuf::from(concat!(
-                    env!("CARGO_MANIFEST_DIR"),
-                    "/src/data/predeployed_contracts/strk/sierra.json"
-                )),
+                persist_embedded_sierra("STRK", strk_sierra)?,
             ),
         ),
         (
             ETH_CONTRACT_NAME.to_string(),
             (
                 StarknetContractArtifacts {
-                    sierra: fs::read_to_string(concat!(
-                        env!("CARGO_MANIFEST_DIR"),
-                        "/src/data/predeployed_contracts/eth/sierra.json"
+                    sierra: eth_sierra.to_string(),
+                    casm: serde_json::from_str(include_str!(
+                        "../../data/predeployed_contracts/ETH/casm.json"
                     ))?,
-                    casm: serde_json::from_str(&fs::read_to_string(concat!(
-                        env!("CARGO_MANIFEST_DIR"),
-                        "/src/data/predeployed_contracts/eth/casm.json"
-                    ))?)?,
                     #[cfg(feature = "cairo-native")]
                     executor: None,
                 },
-                Utf8PathBuf::from(concat!(
-                    env!("CARGO_MANIFEST_DIR"),
-                    "/src/data/predeployed_contracts/eth/sierra.json"
-                )),
+                persist_embedded_sierra("ETH", eth_sierra)?,
             ),
         ),
     ]))
 }
+
+fn persist_embedded_sierra(contract_name: &str, sierra: &str) -> Result<Utf8PathBuf> {
+    let path = std::env::temp_dir()
+        .join("snfoundry-predeployed-contracts")
+        .join(env!("CARGO_PKG_VERSION"))
+        .join(format!("{contract_name}.sierra.json"));
+
+    let parent = path
+        .parent()
+        .with_context(|| format!("Failed to get parent directory for {}", path.display()))?;
+    fs::create_dir_all(parent).with_context(|| {
+        format!(
+            "Failed to create directory for predeployed Sierra at {}",
+            parent.display()
+        )
+    })?;
+    fs::write(&path, sierra).with_context(|| {
+        format!(
+            "Failed to materialize embedded Sierra for {contract_name} at {}",
+            path.display()
+        )
+    })?;
+
+    Utf8PathBuf::from_path_buf(path).map_err(|path| {
+        anyhow!(
+            "Materialized Sierra path is not valid UTF-8: {}",
+            path.display()
+        )
+    })
+}
diff --git a/crates/cheatnet/src/runtime_extensions/forge_runtime_extension/contracts_data.rs b/crates/cheatnet/src/runtime_extensions/forge_runtime_extension/contracts_data.rs
@@ -75,10 +75,22 @@ impl ContractsData {
     }
 
     pub fn extend(&mut self, other: Self) -> Result<()> {
-        for (name, contract_data) in other.contracts {
-            if self.contracts.contains_key(&name) {
+        for (name, contract_data) in &other.contracts {
+            if self.contracts.contains_key(name) {
                 bail!("duplicate contract name: {name}");
             }
+
+            if let Some(existing_name) = self.class_hashes.get_by_right(&contract_data.class_hash) {
+                bail!(
+                    "duplicate contract class hash for `{}` and `{}`: {:?}",
+                    existing_name,
+                    name,
+                    contract_data.class_hash
+                );
+            }
+        }
+
+        for (name, contract_data) in other.contracts {
             self.class_hashes
                 .insert(name.clone(), contract_data.class_hash);
             self.contracts.insert(name, contract_data);
diff --git a/crates/forge-runner/src/debugging/args.rs b/crates/forge-runner/src/debugging/args.rs
@@ -28,6 +28,11 @@ impl TraceArgs {
             }
         }
     }
+
+    /// Returns `true` if no trace-related arguments were provided.
+    pub fn is_empty(&self) -> bool {
+        self.trace_verbosity.is_none() && self.trace_components.is_none()
+    }
 }
 
 fn build_components<'a>(iter: impl IntoIterator<Item = &'a Component>) -> Components {
diff --git a/crates/forge/src/run_tests/package.rs b/crates/forge/src/run_tests/package.rs
@@ -83,7 +83,7 @@ impl RunForPackageArgs {
         cache_dir: &Utf8PathBuf,
         artifacts_dir: &Utf8Path,
         partitioning_config: PartitionConfig,
-        predeployed_contracts: ContractsData,
+        predeployed_contracts: Option<ContractsData>,
         ui: &UI,
     ) -> Result<RunForPackageArgs> {
         let raw_test_targets = load_test_artifacts(artifacts_dir, &package)?;
@@ -99,7 +99,9 @@ impl RunForPackageArgs {
             },
         )?;
         let mut contracts_data = ContractsData::try_from(contracts)?;
-        contracts_data.extend(predeployed_contracts)?;
+        if let Some(predeployed_contracts) = predeployed_contracts {
+            contracts_data.extend(predeployed_contracts)?;
+        }
 
         let forge_config_from_scarb =
             load_package_config::<ForgeConfigFromScarb>(scarb_metadata, &package.id)?;
diff --git a/crates/forge/src/run_tests/workspace.rs b/crates/forge/src/run_tests/workspace.rs
@@ -14,6 +14,8 @@ use crate::{
 };
 use anyhow::Result;
 use cheatnet::predeployment::contracts_data::load_predeployed_contracts;
+use forge_runner::backtrace::is_backtrace_enabled;
+use forge_runner::debugging::TraceArgs;
 use forge_runner::partition::PartitionConfig;
 use forge_runner::test_case_summary::AnyTestCaseSummary;
 use forge_runner::{CACHE_DIR, test_target_summary::TestTargetSummary};
@@ -108,7 +110,9 @@ pub async fn execute_workspace(
 
     let partitioning_config = get_partitioning_config(args, &ui, &packages, &artifacts_dir_path)?;
 
-    let predeployed_contracts = load_predeployed_contracts()?;
+    let predeployed_contracts = should_load_predeployed_contracts_sierra(&args.trace_args)
+        .then(|| load_predeployed_contracts())
+        .transpose()?;
 
     for package in packages {
         let cwd = env::current_dir()?;
@@ -237,3 +241,7 @@ fn unset_forge_test_filter() {
         env::remove_var(SNFORGE_TEST_FILTER);
     };
 }
+
+fn should_load_predeployed_contracts_sierra(trace_args: &TraceArgs) -> bool {
+    is_backtrace_enabled() || !trace_args.is_empty()
+}

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,11 @@ impl TraceArgs {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`
	`31`	`+`
	`32`	+ /// Returns `true` if no trace-related arguments were provided.
	`33`	`+ pub fn is_empty(&self) -> bool {`
	`34`	`+ self.trace_verbosity.is_none() && self.trace_components.is_none()`
	`35`	`+ }`
`31`	`36`	`}`
`32`	`37`
`33`	`38`	`fn build_components<'a>(iter: impl IntoIterator<Item = &'a Component>) -> Components {`