From 2e22ddebebe6a2ce9368297475f04e379c495174 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:23:53 +0000 Subject: [PATCH] no --opcodes --- scripts/common_cmdline.sh | 5 ++--- test/cmdlineTests.sh | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/common_cmdline.sh b/scripts/common_cmdline.sh index 5e32a76dc..e9dc70871 100644 --- a/scripts/common_cmdline.sh +++ b/scripts/common_cmdline.sh @@ -20,8 +20,8 @@ # ------------------------------------------------------------------------------ YULARGS=(--strict-assembly) -FULLARGS=(--optimize --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,hashes,metadata,opcodes,srcmap,srcmap-runtime,userdoc") -OLDARGS=(--optimize --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,interface,metadata,opcodes,srcmap,srcmap-runtime,userdoc") +FULLARGS=(--optimize --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,hashes,metadata,srcmap,srcmap-runtime,userdoc") +OLDARGS=(--optimize --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,interface,metadata,srcmap,srcmap-runtime,userdoc") function compileFull { @@ -148,7 +148,6 @@ function stripCLIDecorations sed -e '/^=======.*=======$/d' \ -e '/^Binary:$/d' \ -e '/^Binary of the runtime part:$/d' \ - -e '/^Opcodes:$/d' \ -e '/^IR:$/d' \ -e '/^Optimized IR:$/d' \ -e '/^EVM assembly:$/d' \ diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh index b02880557..296331de4 100755 --- a/test/cmdlineTests.sh +++ b/test/cmdlineTests.sh @@ -221,7 +221,6 @@ json = re.sub(r"},(\n{0,1})\n*(\s*(]|}))", r"}\1\2", json) open("$stdout_path", "w").write(json) EOF sed -i.bak -E -e 's/ Consider adding \\"pragma solidity \^[0-9.]*;\\"//g' "$stdout_path" - sed -i.bak -E -e 's/\"opcodes\":[[:space:]]*\"[^"]+\"/\"opcodes\":\"\"/g' "$stdout_path" sed -i.bak -E -e 's/\"sourceMap\":[[:space:]]*\"[0-9:;-]+\"/\"sourceMap\":\"\"/g' "$stdout_path" # Remove bytecode (but not linker references).