7582: Remove estimated chain height check from PivotBlockConfirmer wh…

…en waiting for peers Signed-off-by: Matilda Clerke <[email protected]>
hyperledger · Dec 13, 2024 · 8c0df49 · 8c0df49
1 parent 215813d
commit 8c0df49
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...um/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActions.java b/...um/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActions.java
@@ -136,8 +136,7 @@ private CompletableFuture<FastSyncState> internalDownloadPivotBlockHeader(
 
     return ethContext
         .getEthPeers()
-        .waitForPeer(
-            (peer) -> true)
+        .waitForPeer((peer) -> true)
         .thenCompose(
             unused ->
                 currentState

diff --git a/...th/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmer.java b/...th/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmer.java
@@ -188,13 +188,10 @@ private CompletableFuture<BlockHeader> executePivotQuery(final long blockNumber)
       pivotHeaderFuture =
           ethContext
               .getEthPeers()
-              .waitForPeer(
-                  (peer) ->
-                      peer.chainState().getEstimatedHeight() >= blockNumber
-                          && !pivotBlockQueriesByPeerId.containsKey(peer.nodeId()))
+              .waitForPeer((peer) -> !pivotBlockQueriesByPeerId.containsKey(peer.nodeId()))
               .orTimeout(5, TimeUnit.SECONDS)
-              .handle((r, e) -> null) // Ignore result, ensure even a timeout will result in calling
-              // executePivotQuery
+              // Ignore result, ensure even a timeout will result in calling executePivotQuery
+              .handle((r, e) -> null)
               .thenCompose(res -> executePivotQuery(blockNumber));
     }