fixup! [libevmasm] Add support to import evm assembly json.

Author: cameel

scripts/ASTImportTest.sh

@@ -202,34 +202,29 @@ function test_evmjson_import_export_equivalence
     local sol_file="$1"
     local input_files=( "${@:2}" )
 
-    # Compile files (generates the C.bin)
-    mkdir -p sol/
-    run_solc --bin "${input_files[@]}" --output-dir sol/
-    find sol/ -size 0 -delete
+    # Generate bytecode and EVM assembly JSON through normal complication
+    mkdir -p export/
+    local export_options=(--bin --asm-json "${input_files[@]}" --output-dir export/)
+    run_solc "${export_options[@]}"
 
-    mkdir -p asm_json/
-    local export_options=(--asm-json "${input_files[@]}" --output-dir asm_json/)
+    # NOTE: If there is no bytecode, the compiler produces a JSON file that contains just 'null'.
+    # This is not accepted by assembly import though so we must skip such contracts.
+    echo -n null > null
+    find export/ -name '*.json' -exec cmp --quiet --bytes=4 {} null \; -delete
 
-    # Generate asm json file (generates C_evm.json)
-    run_solc "${export_options[@]}"
-    for asm_json_file in asm_json/*.json
+    find export/ -name '*.bin' -size 0 -delete
+
+    for asm_json_file in export/*.json
     do
-        if [[ -n "$(jq --raw-output '. // empty' "$asm_json_file")" ]]
-        then
-            # Remove '_evm' part of filename '<contract-name>_evm.json'
-            mv "${asm_json_file}" "${asm_json_file/_evm/}"
-        else
-            # NOTE: If there is no bytecode, the compiler produces a JSON file that contains just 'null'.
-            # This is not accepted by assembly import though so we must skip such contracts.
-            rm "${asm_json_file}"
-        fi
+        mv "${asm_json_file}" "${asm_json_file/_evm/}"
     done
 
-    mkdir -p imported-from-sol/
-    for asm_json_file in asm_json/*.json
+    # Import EVM assembly JSON
+    mkdir -p import/
+    for asm_json_file in export/*.json
     do
         local bin_file_from_asm_import
-        bin_file_from_asm_import="imported-from-sol/$(basename "${asm_json_file}" .json).bin"
+        bin_file_from_asm_import="import/$(basename "${asm_json_file}" .json).bin"
 
         local import_options=(--bin --import-asm-json "${asm_json_file}")
         run_solc_store_stdout "${bin_file_from_asm_import}" "${import_options[@]}"
@@ -238,9 +233,10 @@ function test_evmjson_import_export_equivalence
         mv tmpfile "$bin_file_from_asm_import"
     done
 
-    for bin_file in sol/*
+    # Compare bytecode from compilation with bytecode from import
+    for bin_file in export/*.bin
     do
-        local bin_file_from_asm_import=${bin_file/sol/imported-from-sol}
+        local bin_file_from_asm_import=${bin_file/export/import}
         if ! diff --strip-trailing-cr --ignore-all-space "${bin_file}" "${bin_file_from_asm_import}" > diff_error
         then
             printError "ERROR: Bytecode from compilation (${bin_file}) differs from bytecode from EVM asm import (${bin_file_from_asm_import}):"