Fleet-mode safe behavior for fcU in SynchronizationService (hyperledg…

…er#7517) * fleet-mode safe behavior for fcU in SynchronizationService Signed-off-by: garyschulte <garyschulte@gmail.com> * spotless Signed-off-by: garyschulte <garyschulte@gmail.com> --------- Signed-off-by: garyschulte <garyschulte@gmail.com>
shemnon · Aug 23, 2024 · d87650b · d87650b
1 parent 58bb931
commit d87650b
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/services/SynchronizationServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/SynchronizationServiceImpl.java
@@ -74,17 +74,11 @@ public SynchronizationServiceImpl(
   @Override
   public void fireNewUnverifiedForkchoiceEvent(
       final Hash head, final Hash safeBlock, final Hash finalizedBlock) {
-    final MergeContext mergeContext = protocolContext.getConsensusContext(MergeContext.class);
-    if (mergeContext != null) {
-      mergeContext.fireNewUnverifiedForkchoiceEvent(head, safeBlock, finalizedBlock);
-      protocolContext.getBlockchain().setFinalized(finalizedBlock);
-      protocolContext.getBlockchain().setSafeBlock(safeBlock);
-    } else {
-      LOG.atWarn()
-          .setMessage(
-              "The merge context is unavailable, hence the fork choice event cannot be triggered")
-          .log();
-    }
+    protocolContext
+        .safeConsensusContext(MergeContext.class)
+        .ifPresent(mc -> mc.fireNewUnverifiedForkchoiceEvent(head, safeBlock, finalizedBlock));
+    protocolContext.getBlockchain().setFinalized(finalizedBlock);
+    protocolContext.getBlockchain().setSafeBlock(safeBlock);
   }
 
   @Override