fix: ensure all crates are present when testing

dojoengine · Oct 12, 2024 · afd1b87 · afd1b87
1 parent 2c79b85
commit afd1b87
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/bins/demo-compiler/src/commands/test.rs b/bins/demo-compiler/src/commands/test.rs
@@ -10,7 +10,7 @@ use cairo_lang_test_plugin::{test_plugin_suite, TestsCompilationConfig};
 use cairo_lang_test_runner::{CompiledTestRunner, RunProfilerConfig, TestCompiler, TestRunConfig};
 use clap::Args;
 use dojo_compiler::compiler::cairo_compiler::{
-    collect_crates_ids_from_selectors, collect_main_crate_ids, Props,
+    collect_all_crate_ids, collect_crates_ids_from_selectors, collect_main_crate_ids, Props,
 };
 use dojo_compiler::compiler::config::{CompilerConfig, DojoConfigLoader};
 use dojo_compiler::compiler::scarb_internal::{
@@ -165,7 +165,7 @@ impl TestArgs {
 
             let test_crate_ids = collect_main_crate_ids(&unit, &db, false);
 
-            let mut main_crate_ids = test_crate_ids.clone();
+            let mut main_crate_ids = collect_all_crate_ids(&unit, &db);
 
             if let Some(external_contracts) = props.build_external_contracts {
                 main_crate_ids.extend(collect_crates_ids_from_selectors(&db, &external_contracts));

diff --git a/crates/compiler/src/compiler/cairo_compiler.rs b/crates/compiler/src/compiler/cairo_compiler.rs
@@ -377,3 +377,10 @@ pub fn collect_crates_ids_from_selectors(
         .map(|package_name: SmolStr| db.intern_crate(CrateLongId::Real(package_name)))
         .collect::<Vec<_>>()
 }
+
+pub fn collect_all_crate_ids(unit: &CairoCompilationUnit, db: &RootDatabase) -> Vec<CrateId> {
+    unit.components
+        .iter()
+        .map(|component| db.intern_crate(CrateLongId::Real(component.cairo_package_name())))
+        .collect()
+}