Merge remote-tracking branch 'upstream/master' into duty-time-metric

courtneyeh · Oct 16, 2023 · fb16ac0 · fb16ac0
2 parents 49715e5 + eaf6e7c
commit fb16ac0
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/storage/src/main/java/tech/pegasys/teku/storage/protoarray/ProtoArray.java b/storage/src/main/java/tech/pegasys/teku/storage/protoarray/ProtoArray.java
@@ -596,14 +596,15 @@ private void changeToNone(ProtoNode parent) {
    * Indicates if the node itself is viable for the head, or if it's best descendant is viable for
    * the head.
    */
-  private boolean nodeLeadsToViableHead(ProtoNode node) {
-    boolean bestDescendantIsViableForHead =
-        node.getBestDescendantIndex()
-            .map(this::getNodeByIndex)
-            .map(this::nodeIsViableForHead)
-            .orElse(false);
-
-    return bestDescendantIsViableForHead || nodeIsViableForHead(node);
+  private boolean nodeLeadsToViableHead(final ProtoNode node) {
+    if (nodeIsViableForHead(node)) {
+      return true;
+    }
+
+    return node.getBestDescendantIndex()
+        .map(this::getNodeByIndex)
+        .map(this::nodeIsViableForHead)
+        .orElse(false);
   }
 
   /**