fix: support one-part format of the ZKsync version of solc

matter-labs · May 21, 2024 · d19c4a5 · d19c4a5
1 parent 83c19bf
commit d19c4a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler_tester/src/compilers/solidity/mod.rs b/compiler_tester/src/compilers/solidity/mod.rs
@@ -172,7 +172,7 @@ impl SolidityCompiler {
         libraries: &BTreeMap<String, BTreeMap<String, String>>,
         mode: &SolidityMode,
     ) -> anyhow::Result<era_compiler_solidity::SolcStandardJsonOutput> {
-        let mut solc = if mode.is_system_contracts_mode {
+        let mut solc_compiler = if mode.is_system_contracts_mode {
             Self::system_contract_executable()
         } else {
             Self::executable(&mode.solc_version)
@@ -219,7 +219,7 @@ impl SolidityCompiler {
             .to_string_lossy()
             .to_string();
 
-        solc.standard_json(
+        solc_compiler.standard_json(
             solc_input,
             Some(mode.solc_pipeline),
             None,
@@ -373,7 +373,11 @@ impl Compiler for SolidityCompiler {
         let last_contract = Self::get_last_contract(&solc_output, &sources)
             .map_err(|error| anyhow::anyhow!("Failed to get the last contract: {}", error))?;
 
-        let mut solc_compiler = SolidityCompiler::executable(&mode.solc_version)?;
+        let mut solc_compiler = if mode.is_system_contracts_mode {
+            SolidityCompiler::system_contract_executable()
+        } else {
+            SolidityCompiler::executable(&mode.solc_version)
+        }?;
 
         let project = era_compiler_solidity::Project::try_from_solidity_sources(
             &mut solc_output,