Get best peer for receiving new blocks (hyperledger#1944)

Signed-off-by: David Mechler <david.mechler@consensys.net>
atoulme · Feb 24, 2021 · a946152 · a946152
1 parent f1c74ed
commit a946152
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...eum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManager.java b/...eum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManager.java
@@ -229,7 +229,8 @@ private void handleNewBlockHashesFromNetwork(final EthMessage message) {
 
       // Process known blocks we care about
       for (final NewBlockHash newBlock : newBlocks) {
-        processAnnouncedBlock(message.getPeer(), newBlock)
+        EthPeer bestPeer = ethContext.getEthPeers().bestPeer().orElse(message.getPeer());
+        processAnnouncedBlock(bestPeer, newBlock)
             .whenComplete((r, t) -> requestedBlocks.remove(newBlock.hash()));
       }
     } catch (final RLPException e) {

diff --git a/...eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManagerTest.java b/...eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManagerTest.java
@@ -135,6 +135,8 @@ public void importsAnnouncedBlocks_aheadOfChainInOrder() {
 
     blockPropagationManager.start();
 
+    // Setup additonal peer for best peers list
+    EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
     // Setup peer and messages
     final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
     final NewBlockHashesMessage nextAnnouncement =