fixup! fixup! fixup! Introduce sub-assembly offset output artifact

ethereum · Jan 17, 2025 · e4f8896 · e4f8896
1 parent 6edeb8e
commit e4f8896
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 30 deletions.
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
@@ -1287,12 +1287,6 @@ Json StandardCompiler::importEVMAssembly(StandardCompiler::InputsAndSettings _in
 			deployedJSON["linkReferences"] = formatLinkReferences(stack.runtimeObject(sourceName).linkReferences);
 		if (evmDeployedArtifactRequested("immutableReferences"))
 			deployedJSON["immutableReferences"] = formatImmutableReferences(stack.runtimeObject(sourceName).immutableReferences);
-		if (evmDeployedArtifactRequested("subAssemblyOffsets"))
-		{
-			Json ret = Json::object();
-			ret["subs"] = formatSubAssemblyOffsets(stack.runtimeObject(sourceName).subAssemblyData);
-			deployedJSON["subAssemblyOffsets"] = std::move(ret);
-		}
 		evmData["deployedBytecode"] = deployedJSON;
 	}
 

diff --git a/test/cmdlineTests/standard_import_asm_json/output.json b/test/cmdlineTests/standard_import_asm_json/output.json
@@ -22,10 +22,7 @@
                         "linkReferences": {},
                         "object": "",
                         "opcodes": "",
-                        "sourceMap": "",
-                        "subAssemblyOffsets": {
-                            "subs": []
-                        }
+                        "sourceMap": ""
                     },
                     "legacyAssembly": {
                         ".code": [

diff --git a/test/cmdlineTests/standard_import_asm_json_immutable_references/output.json b/test/cmdlineTests/standard_import_asm_json_immutable_references/output.json
@@ -32,16 +32,7 @@
                         "linkReferences": {},
                         "object": "<BYTECODE REMOVED>",
                         "opcodes":"<OPCODES REMOVED>",
-                        "sourceMap":"<SOURCEMAP REMOVED>",
-                        "subAssemblyOffsets": {
-                            "subs": [
-                                {
-                                    "isCreation": false,
-                                    "length": 87,
-                                    "start": 0
-                                }
-                            ]
-                        }
+                        "sourceMap":"<SOURCEMAP REMOVED>"
                     }
                 }
             }

diff --git a/test/cmdlineTests/standard_import_asm_json_link_references/output.json b/test/cmdlineTests/standard_import_asm_json_link_references/output.json
@@ -34,16 +34,7 @@
                         },
                         "object": "<BYTECODE REMOVED>__$d553ddd21b3d8da0d69a6510c170f4a77b$__<BYTECODE REMOVED>",
                         "opcodes":"<OPCODES REMOVED>",
-                        "sourceMap":"<SOURCEMAP REMOVED>",
-                        "subAssemblyOffsets": {
-                            "subs": [
-                                {
-                                    "isCreation": false,
-                                    "length": 75,
-                                    "start": 0
-                                }
-                            ]
-                        }
+                        "sourceMap":"<SOURCEMAP REMOVED>"
                     }
                 }
             }