7311: Fix broken test by correctly including peer in PeerTaskExecutor…

…Results in test classes Signed-off-by: Matilda Clerke <[email protected]>
hyperledger · Nov 26, 2024 · f002ba3 · f002ba3
1 parent ddceb7c
commit f002ba3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/...rledger/besu/ethereum/eth/manager/peertask/task/GetHeadersFromPeerTaskExecutorAnswer.java b/...rledger/besu/ethereum/eth/manager/peertask/task/GetHeadersFromPeerTaskExecutorAnswer.java
@@ -16,6 +16,7 @@
 
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.manager.peertask.PeerTaskExecutorResponseCode;
 import org.hyperledger.besu.ethereum.eth.manager.peertask.PeerTaskExecutorResult;
 
@@ -29,9 +30,12 @@
 public class GetHeadersFromPeerTaskExecutorAnswer
     implements Answer<PeerTaskExecutorResult<List<BlockHeader>>> {
   private final Blockchain otherBlockchain;
+  private final EthPeers ethPeers;
 
-  public GetHeadersFromPeerTaskExecutorAnswer(final Blockchain otherBlockchain) {
+  public GetHeadersFromPeerTaskExecutorAnswer(
+      final Blockchain otherBlockchain, final EthPeers ethPeers) {
     this.otherBlockchain = otherBlockchain;
+    this.ethPeers = ethPeers;
   }
 
   @Override
@@ -79,6 +83,6 @@ public PeerTaskExecutorResult<List<BlockHeader>> answer(final InvocationOnMock i
     return new PeerTaskExecutorResult<>(
         Optional.of(getHeadersFromPeerTaskResult),
         PeerTaskExecutorResponseCode.SUCCESS,
-        Optional.empty());
+        ethPeers.bestPeer());
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTrackerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTrackerTest.java
@@ -92,7 +92,8 @@ public void setup(final DataStorageFormat storageFormat, final boolean isPeerTas
             .build();
     peerTaskExecutor = Mockito.mock(PeerTaskExecutor.class);
     GetHeadersFromPeerTaskExecutorAnswer getHeadersAnswer =
-        new GetHeadersFromPeerTaskExecutorAnswer(blockchain);
+        new GetHeadersFromPeerTaskExecutorAnswer(
+            blockchain, ethProtocolManager.ethContext().getEthPeers());
     Mockito.when(peerTaskExecutor.execute(Mockito.any(GetHeadersFromPeerTask.class)))
         .thenAnswer(getHeadersAnswer);
     Mockito.when(

diff --git a/...c/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncStepTest.java b/...c/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncStepTest.java
@@ -153,7 +153,7 @@ public void setup() {
     when(context.getEthContext()).thenReturn(ethContext);
 
     Answer<PeerTaskExecutorResult<List<BlockHeader>>> getHeadersAnswer =
-        new GetHeadersFromPeerTaskExecutorAnswer(remoteBlockchain);
+        new GetHeadersFromPeerTaskExecutorAnswer(remoteBlockchain, ethContext.getEthPeers());
     when(peerTaskExecutor.execute(any(GetHeadersFromPeerTask.class))).thenAnswer(getHeadersAnswer);
     when(peerTaskExecutor.executeAgainstPeer(any(GetHeadersFromPeerTask.class), any(EthPeer.class)))
         .thenAnswer(getHeadersAnswer);

diff --git a/.../hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckPointSyncChainDownloaderTest.java b/.../hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckPointSyncChainDownloaderTest.java
@@ -161,7 +161,7 @@ public void setup(final DataStorageFormat dataStorageFormat) {
             });
 
     final Answer<PeerTaskExecutorResult<List<BlockHeader>>> getHeadersAnswer =
-        new GetHeadersFromPeerTaskExecutorAnswer(otherBlockchain);
+        new GetHeadersFromPeerTaskExecutorAnswer(otherBlockchain, ethContext.getEthPeers());
     when(peerTaskExecutor.execute(any(GetHeadersFromPeerTask.class))).thenAnswer(getHeadersAnswer);
     when(peerTaskExecutor.executeAgainstPeer(any(GetHeadersFromPeerTask.class), any(EthPeer.class)))
         .thenAnswer(getHeadersAnswer);