Refactor

scarb/src/compiler/compilers/starknet_contract.rs

@@ -233,7 +233,7 @@ impl Compiler for StarknetContractCompiler {
 
         let compiler_config = build_compiler_config(db, &unit, &main_crate_ids, ws);
 
-        let Compiled {
+        let CompiledContracts {
             contract_paths,
             contracts,
             classes,
@@ -353,7 +353,7 @@ impl ArtifactsWriter {
     }
 }
 
-pub struct Compiled {
+pub struct CompiledContracts {
     pub contract_paths: Vec<String>,
     pub contracts: Vec<ContractDeclaration>,
     pub classes: Vec<ContractClass>,
@@ -365,7 +365,7 @@ pub fn get_compiled_contracts(
     compiler_config: CompilerConfig<'_>,
     db: &mut RootDatabase,
     ws: &Workspace<'_>,
-) -> Result<Compiled> {
+) -> Result<CompiledContracts> {
     let contracts = find_project_contracts(
         db.upcast_mut(),
         ws.config().ui(),
@@ -383,7 +383,7 @@ pub fn get_compiled_contracts(
         let _ = trace_span!("compile_starknet").enter();
         compile_prepared_db(db, &contracts.iter().collect::<Vec<_>>(), compiler_config)?
     };
-    Ok(Compiled {
+    Ok(CompiledContracts {
         contract_paths,
         contracts,
         classes,

scarb/src/compiler/compilers/test.rs

@@ -9,7 +9,8 @@ use tracing::trace_span;
 
 use crate::compiler::compilers::starknet_contract::Props as StarknetContractProps;
 use crate::compiler::compilers::{
-    ensure_gas_enabled, get_compiled_contracts, ArtifactsWriter, Compiled, ContractSelector,
+    ensure_gas_enabled, get_compiled_contracts, ArtifactsWriter, CompiledContracts,
+    ContractSelector,
 };
 use crate::compiler::helpers::{
     build_compiler_config, collect_all_crate_ids, collect_main_crate_ids, write_json,
@@ -83,6 +84,8 @@ impl Compiler for TestCompiler {
         }
 
         if starknet {
+            // Note: this will only search for contracts in the main CU component and
+            // `build-external-contracts`. It will not collect contracts from all dependencies.
             compile_contracts(test_crate_ids, target_dir, unit, db, ws)?;
         }
 
@@ -108,7 +111,7 @@ fn compile_contracts(
         ..StarknetContractProps::default()
     };
     let compiler_config = build_compiler_config(db, &unit, &main_crate_ids, ws);
-    let Compiled {
+    let CompiledContracts {
         contract_paths,
         contracts,
         classes,