fix format to output dict

tserg · May 9, 2024 · aa341c1 · aa341c1
1 parent a84aacc
commit aa341c1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/tests/unit/cli/vyper_json/test_compile_json.py b/tests/unit/cli/vyper_json/test_compile_json.py
@@ -171,12 +171,17 @@ def test_compile_json(input_json, input_bundle):
             "userdoc": data["userdoc"],
             "metadata": data["metadata"],
             "evm": {
-                "bytecode": {"object": data["bytecode"], "opcodes": data["opcodes"]},
+                "bytecode": {
+                    "object": data["bytecode"],
+                    "opcodes": data["opcodes"],
+                    "sourceMap": data["source_map"]["pc_pos_map_compressed"],
+                    "sourceMapFull": data["source_map_full"],
+                },
                 "deployedBytecode": {
                     "object": data["bytecode_runtime"],
                     "opcodes": data["opcodes_runtime"],
-                    "sourceMap": data["source_map"]["pc_pos_map_compressed"],
-                    "sourceMapFull": data["source_map_full"],
+                    "sourceMap": data["source_map_runtime"]["pc_pos_map_compressed"],
+                    "sourceMapFull": data["source_map_full_runtime"],
                 },
                 "methodIdentifiers": data["method_identifiers"],
             },

diff --git a/vyper/cli/vyper_json.py b/vyper/cli/vyper_json.py
@@ -344,7 +344,7 @@ def format_to_output_dict(compiler_data: dict) -> dict:
 
         evm_keys = ("bytecode", "opcodes")
         pc_maps_keys = ("source_map", "source_map_full")
-        if any(i in data for i in evm_keys) or any(i in data for i in pc_maps_keys):
+        if any(i in data for i in evm_keys + pc_maps_keys):
             evm = output_contracts.setdefault("evm", {}).setdefault("bytecode", {})
             if "bytecode" in data:
                 evm["object"] = data["bytecode"]
@@ -355,7 +355,7 @@ def format_to_output_dict(compiler_data: dict) -> dict:
             if "source_map_full" in data:
                 evm["sourceMapFull"] = data["source_map_full"]
 
-        if any(i + "_runtime" in data for i in evm_keys):
+        if any(i + "_runtime" in data for i in evm_keys + pc_maps_keys):
             evm = output_contracts.setdefault("evm", {}).setdefault("deployedBytecode", {})
             if "bytecode_runtime" in data:
                 evm["object"] = data["bytecode_runtime"]