convert Solidity SC resolution globs to PathBuf

matter-labs · Jan 16, 2025 · be298bb · be298bb
1 parent d7e8a95
commit be298bb
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/compiler_tester/src/vm/eravm/system_contracts.rs b/compiler_tester/src/vm/eravm/system_contracts.rs
@@ -228,7 +228,7 @@ impl SystemContracts {
             ),
             (
                 web3::types::Address::from_low_u64_be(zkevm_opcode_defs::ADDRESS_IDENTITY.into()),
-                Self::normalize_path(Self::PATH_IDENTITY.0, None),
+                Self::normalize_path(Self::PATH_IDENTITY.0, Some(Self::PATH_IDENTITY.1)),
             ),
             (
                 web3::types::Address::from_low_u64_be(
@@ -336,8 +336,12 @@ impl SystemContracts {
             "era-contracts/system-contracts/contracts/interfaces/**/*.sol",
             "era-contracts/system-contracts/contracts/openzeppelin/**/*.sol",
             "tests/solidity/complex/interpreter/*.sol",
-        ] {
-            for path in glob::glob(pattern)?.filter_map(Result::ok) {
+        ]
+        .into_iter()
+        .map(PathBuf::from)
+        {
+            for path in glob::glob(pattern.to_str().expect("Always valid"))?.filter_map(Result::ok)
+            {
                 let path = path.to_string_lossy().to_string();
                 if !solidity_file_paths.contains(&path) {
                     solidity_file_paths.push(path);
@@ -492,7 +496,10 @@ impl SystemContracts {
                 )
             })?;
 
-            if file_path == r"era-contracts\system-contracts\contracts\Constants.sol" {
+            if file_path
+                == PathBuf::from("era-contracts/system-contracts/contracts/Constants.sol")
+                    .to_string_lossy()
+            {
                 source = source.replace("{{SYSTEM_CONTRACTS_OFFSET}}", "0x8000");
             }