Adapt code after rebase

Signed-off-by: Luis Pinto <[email protected]>

Author: lu-pinto

datatypes/src/main/java/org/hyperledger/besu/datatypes/AccessEvent.java

@@ -290,11 +290,13 @@ public long rollbackAccessAndGet() {
   public abstract String costSchedulePrettyPrint();
 
   /**
-   * Prints a shorter version of {@code toString()}.
+   * Get the key that is associated with this access event.
    *
-   * @return the string
+   * @return the type T that represents the key.
    */
-  public abstract String toShortString();
+  public T getKey() {
+    return key;
+  }
 
   /**
    * Get the stateless tree index corresponding to this access event.
@@ -304,4 +306,11 @@ public long rollbackAccessAndGet() {
   public UInt256 getIndex() {
     return index;
   }
+
+  /**
+   * Prints a {@code toString()} version suitable printed in JSON format.
+   *
+   * @return the string
+   */
+  public abstract String toJsonObject();
 }

datatypes/src/main/java/org/hyperledger/besu/datatypes/BranchAccessKey.java

@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
 
-import org.hyperledger.besu.datatypes.LeafAccessKey;
+import org.hyperledger.besu.datatypes.AccessEvent;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 
 import java.util.Arrays;
@@ -67,7 +67,7 @@ public StructLog(final TraceFrame traceFrame) {
     statelessWitness =
         traceFrame
             .getStatelessWitness()
-            .map(list -> list.stream().map(LeafAccessKey::toJsonObject).toArray(String[]::new))
+            .map(list -> list.stream().map(AccessEvent::toJsonObject).toArray(String[]::new))
             .orElse(null);
     op = traceFrame.getOpcode();
     pc = traceFrame.getPc();
@@ -134,6 +134,7 @@ public Object storage() {
   }
 
   @JsonGetter("statelessWitness")
+  @JsonInclude(JsonInclude.Include.NON_NULL)
   public String[] statelessWitness() {
     return statelessWitness;
   }