Move validation before usage in build-external glob selectors (#914)

software-mansion · Nov 17, 2023 · 50e5d94 · 50e5d94
1 parent e55953b
commit 50e5d94
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/scarb/src/compiler/compilers/starknet_contract.rs b/scarb/src/compiler/compilers/starknet_contract.rs
@@ -203,6 +203,14 @@ impl Compiler for StarknetContractCompiler {
             );
         }
 
+        if let Some(external_contracts) = props.build_external_contracts.clone() {
+            for path in external_contracts.iter() {
+                ensure!(path.0.matches(GLOB_PATH_SELECTOR).count() <= 1,
+                    "external contract path {} has multiple global path selectors, only one '*' selector is allowed",
+                    path.0);
+            }
+        }
+
         let target_dir = unit.target_dir(ws);
 
         let compiler_config = build_compiler_config(&unit, ws);
@@ -215,12 +223,6 @@ impl Compiler for StarknetContractCompiler {
             props.build_external_contracts.clone(),
         )?;
 
-        if let Some(external_contracts) = props.build_external_contracts.clone() {
-            for path in external_contracts.iter() {
-                ensure!(path.0.matches(GLOB_PATH_SELECTOR).count() <= 1, format!("external contract path {} has multiple global path selectors, only one '*' selector is allowed", path.0));
-            }
-        }
-
         let contract_paths = contracts
             .iter()
             .map(|decl| decl.module_id().full_path(db.upcast_mut()))