Skip to content

Commit 7e830e0

Browse files
committed
Fix incorrect import of 0.0.2 format
1 parent 80b2848 commit 7e830e0

File tree

1 file changed

+11
-19
lines changed

1 file changed

+11
-19
lines changed

crytic_compile/platform/standard.py

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
from crytic_compile.compiler.compiler import CompilerVersion
1212
from crytic_compile.platform import Type as PlatformType
1313
from crytic_compile.platform.abstract_platform import AbstractPlatform
14-
from crytic_compile.utils.naming import Filename, convert_filename
15-
14+
from crytic_compile.utils.naming import Filename
1615
# Cycle dependency
1716
from crytic_compile.utils.natspec import Natspec
1817

@@ -435,15 +434,16 @@ def _load_from_compile_current(crytic_compile: "CryticCompile", loaded_json: Dic
435434
version=compilation_unit_json["compiler"]["version"],
436435
optimized=compilation_unit_json["compiler"]["optimized"],
437436
)
438-
for contracts_data in compilation_unit_json["contracts"].values():
439-
for contract_name, contract in contracts_data.items():
440437

441-
filename = Filename(
442-
absolute=contract["filenames"]["absolute"],
443-
relative=contract["filenames"]["relative"],
444-
short=contract["filenames"]["short"],
445-
used=contract["filenames"]["used"],
446-
)
438+
compilation_unit.filenames = {
439+
_convert_dict_to_filename(filename) for filename in compilation_unit_json["filenames"]
440+
}
441+
442+
for filename_str, source_unit_data in compilation_unit_json["source_units"].items():
443+
filename = compilation_unit.filename_lookup(filename_str)
444+
source_unit = compilation_unit.create_source_unit(filename)
445+
446+
for contract_name, contract in source_unit_data["contracts"].items():
447447
compilation_unit.filename_to_contracts[filename].add(contract_name)
448448

449449
source_unit = compilation_unit.create_source_unit(filename)
@@ -465,15 +465,7 @@ def _load_from_compile_current(crytic_compile: "CryticCompile", loaded_json: Dic
465465
crytic_compile.dependencies.add(filename.short)
466466
crytic_compile.dependencies.add(filename.used)
467467

468-
compilation_unit.filenames = {
469-
_convert_dict_to_filename(filename) for filename in compilation_unit_json["filenames"]
470-
}
471-
472-
for path, ast in compilation_unit_json["asts"].items:
473-
# The following might create lookup issue?
474-
filename = convert_filename(path, lambda x: x, crytic_compile)
475-
source_unit = compilation_unit.create_source_unit(filename)
476-
source_unit.ast = ast
468+
source_unit.ast = source_unit_data["ast"]
477469

478470

479471
def load_from_compile(crytic_compile: "CryticCompile", loaded_json: Dict) -> Tuple[int, List[str]]:

0 commit comments

Comments
 (0)