Update newling handling in fuzzing CLI tools (#7428)

* Fuzzing initcode fix Make sure each response has a newline Signed-off-by: Danno Ferrin <[email protected]> * correct blank line handling Signed-off-by: Danno Ferrin <[email protected]> * correct blank line handling Signed-off-by: Danno Ferrin <[email protected]> --------- Signed-off-by: Danno Ferrin <[email protected]>
hyperledger · Aug 6, 2024 · 7433c8c · 7433c8c
1 parent 541aacd
commit 7433c8c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/CodeValidateSubCommand.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/CodeValidateSubCommand.java
@@ -39,6 +39,7 @@
 import java.util.stream.IntStream;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.web3j.utils.Strings;
 import picocli.CommandLine;
 import picocli.CommandLine.ParentCommand;
 
@@ -107,7 +108,10 @@ public void run() {
       }
     } else {
       for (String code : cliCode) {
-        parentCommand.out.print(considerCode(code));
+        String validation = considerCode(code);
+        if (!Strings.isBlank(validation)) {
+          parentCommand.out.println(validation);
+        }
       }
     }
     parentCommand.out.flush();
@@ -116,7 +120,10 @@ public void run() {
   private void checkCodeFromBufferedReader(final BufferedReader in) {
     try {
       for (String code = in.readLine(); code != null; code = in.readLine()) {
-        parentCommand.out.print(considerCode(code));
+        String validation = considerCode(code);
+        if (!Strings.isBlank(validation)) {
+          parentCommand.out.println(validation);
+        }
       }
     } catch (IOException e) {
       throw new RuntimeException(e);
@@ -142,15 +149,15 @@ public String considerCode(final String hexCode) {
           Bytes.fromHexString(
               hexCode.replaceAll("(^|\n)#[^\n]*($|\n)", "").replaceAll("[^0-9A-Za-z]", ""));
     } catch (RuntimeException re) {
-      return "err: hex string -" + re + "\n";
+      return "err: hex string -" + re;
     }
     if (codeBytes.isEmpty()) {
       return "";
     }
 
     EOFLayout layout = evm.parseEOF(codeBytes);
     if (!layout.isValid()) {
-      return "err: layout - " + layout.invalidReason() + "\n";
+      return "err: layout - " + layout.invalidReason();
     }
 
     Code code = evm.getCodeUncached(codeBytes);
@@ -165,8 +172,7 @@ public String considerCode(final String hexCode) {
               .mapToObj(code::getCodeSection)
               .map(cs -> code.getBytes().slice(cs.getEntryPoint(), cs.getLength()))
               .map(Bytes::toUnprefixedHexString)
-              .collect(Collectors.joining(","))
-          + "\n";
+              .collect(Collectors.joining(","));
     }
   }
 }
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/code-validate/initcode.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/code-validate/initcode.json
@@ -3,5 +3,5 @@
     "code-validate"
   ],
   "stdin": "ef000101000402000100060300010014040000000080000260006000ee00ef00010100040200010001040000000080000000",
-  "stdout": "err: code is valid initcode.  Runtime code expected"
+  "stdout": "err: code is valid initcode.  Runtime code expected\n"
 }