fix(evmtool): implement --repeat option in state-test subcommand (#8863)

* fix(evmtool): implement --repeat option in state-test subcommand

Signed-off-by: Dyslex7c <[email protected]>

* fix: spotless check failing

Signed-off-by: Dyslex7c <[email protected]>

* fix: prevent repeated trace, and errors during invalid tx

Signed-off-by: Dyslex7c <[email protected]>

---------

Signed-off-by: Dyslex7c <[email protected]>
Co-authored-by: Sally MacFarlane <[email protected]>

Author: Dyslex7c

ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommand.java

@@ -265,6 +265,10 @@ void setBytes(final String optionValue) {
       description = "display version info")
   boolean versionInfoRequested;
 
+  Integer getRepeatCount() {
+    return repeat;
+  }
+
   static final Joiner STORAGE_JOINER = Joiner.on(",\n");
   private final EvmToolCommandOptionsModule daggerOptions = new EvmToolCommandOptionsModule();
   PrintWriter out;

ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/StateTestSubCommand.java

@@ -189,20 +189,29 @@ public void run() {
   }
 
   private void executeStateTest(final Map<String, GeneralStateTestCaseSpec> generalStateTests) {
-    for (final Map.Entry<String, GeneralStateTestCaseSpec> generalStateTestEntry :
-        generalStateTests.entrySet()) {
-      if (testName == null || testName.equals(generalStateTestEntry.getKey())) {
-        generalStateTestEntry
-            .getValue()
-            .finalStateSpecs()
-            .forEach((__, specs) -> traceTestSpecs(generalStateTestEntry.getKey(), specs));
+    int repeatCount = Math.max(1, parentCommand.getRepeatCount());
+    for (int i = 0; i < repeatCount; i++) {
+      boolean isLastIteration = (i == repeatCount - 1);
+      for (final Map.Entry<String, GeneralStateTestCaseSpec> generalStateTestEntry :
+          generalStateTests.entrySet()) {
+        if (testName == null || testName.equals(generalStateTestEntry.getKey())) {
+          generalStateTestEntry
+              .getValue()
+              .finalStateSpecs()
+              .forEach(
+                  (__, specs) ->
+                      traceTestSpecs(generalStateTestEntry.getKey(), specs, isLastIteration));
+        }
       }
     }
   }
 
-  private void traceTestSpecs(final String test, final List<GeneralStateTestCaseEipSpec> specs) {
+  private void traceTestSpecs(
+      final String test,
+      final List<GeneralStateTestCaseEipSpec> specs,
+      final boolean isLastIteration) {
     final OperationTracer tracer = // You should have picked Mercy.
-        parentCommand.showJsonResults
+        parentCommand.showJsonResults && isLastIteration
             ? new StandardJsonTracer(
                 parentCommand.out,
                 parentCommand.showMemory,
@@ -231,7 +240,7 @@ private void traceTestSpecs(final String test, final List<GeneralStateTestCaseEi
       final Transaction transaction = spec.getTransaction(0);
       final ObjectNode summaryLine = objectMapper.createObjectNode();
       if (transaction == null) {
-        if (parentCommand.showJsonAlloc || parentCommand.showJsonResults) {
+        if ((parentCommand.showJsonAlloc || parentCommand.showJsonResults) && isLastIteration) {
           parentCommand.out.println(
               "{\"error\":\"Transaction was invalid, trace and alloc unavailable.\"}");
         }
@@ -332,12 +341,14 @@ private void traceTestSpecs(final String test, final List<GeneralStateTestCaseEi
         if (!result.getValidationResult().isValid()) {
           summaryLine.put("error", result.getValidationResult().getErrorMessage());
         }
-        if (parentCommand.showJsonAlloc) {
+        if (parentCommand.showJsonAlloc && isLastIteration) {
           EvmToolCommand.dumpWorldState(worldState, parentCommand.out);
         }
       }
 
-      parentCommand.out.println(summaryLine);
+      if (isLastIteration) {
+        parentCommand.out.println(summaryLine);
+      }
     }
   }
 }