Merge branch 'master' into pruning-parallel

errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/ExperimentalCliOptionNotHiddenNegativeCases.java

@@ -17,21 +17,18 @@
 
 import picocli.CommandLine;
 
-import java.util.Objects;
-
 public class ExperimentalCliOptionNotHiddenNegativeCases {
 
   @CommandLine.Option(
-          hidden = true,
-          names = {"--Xexperimental"})
+      hidden = true,
+      names = {"--Xexperimental"})
   private String experimental = "";
 
   @CommandLine.Option(
-          hidden = false,
-          names = {"--notExperimental"})
+      hidden = false,
+      names = {"--notExperimental"})
   private String notExperimental = "";
 
-  @CommandLine.Option(
-          names = {"--notExperimental2"})
+  @CommandLine.Option(names = {"--notExperimental2"})
   private String notExperimental2 = "";
 }

errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/ExperimentalCliOptionNotHiddenPositiveCases.java

@@ -17,18 +17,15 @@
 
 import picocli.CommandLine;
 
-import java.util.Objects;
-
 public class ExperimentalCliOptionNotHiddenPositiveCases {
 
   // BUG: Diagnostic contains:  Experimental options must be hidden.
   @CommandLine.Option(
-          hidden = false,
-          names = {"--Xexperimental"})
+      hidden = false,
+      names = {"--Xexperimental"})
   private String experimental = "";
 
   // BUG: Diagnostic contains:  Experimental options must be hidden.
-  @CommandLine.Option(
-          names = {"--Xexperimental2"})
+  @CommandLine.Option(names = {"--Xexperimental2"})
   private String experimental2 = "";
 }

ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerklePatriciaTrie.java

@@ -92,4 +92,6 @@ public interface MerklePatriciaTrie<K, V> {
   void visitAll(Consumer<Node<V>> nodeConsumer);
 
   CompletableFuture<Void> visitAll(Consumer<Node<V>> nodeConsumer, ExecutorService executorService);
+
+  void visitLeafs(final TrieIterator.LeafHandler<V> handler);
 }