From 5006b396ef724fe05d1af886f75d087d3ba8dde7 Mon Sep 17 00:00:00 2001 From: Matilda Clerke Date: Mon, 7 Oct 2024 09:20:21 +1100 Subject: [PATCH] 7311: Fix up compile errors after merge Signed-off-by: Matilda Clerke --- besu/src/test/java/org/hyperledger/besu/RunnerTest.java | 4 ++-- .../eth/manager/peertask/task/GetReceiptsFromPeerTask.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/besu/src/test/java/org/hyperledger/besu/RunnerTest.java b/besu/src/test/java/org/hyperledger/besu/RunnerTest.java index 4efe3d21d1..f6387d5b3b 100644 --- a/besu/src/test/java/org/hyperledger/besu/RunnerTest.java +++ b/besu/src/test/java/org/hyperledger/besu/RunnerTest.java @@ -159,7 +159,7 @@ public final class RunnerTest { @Test public void fullSyncFromGenesisUsingPeerTaskSystem() throws Exception { // set merge flag to false, otherwise this test can fail if a merge test runs first - MergeConfigOptions.setMergeEnabled(false); + MergeConfiguration.setMergeEnabled(false); syncFromGenesis(SyncMode.FULL, getFastSyncGenesis(), true); } @@ -175,7 +175,7 @@ public final class RunnerTest { @Test public void fastSyncFromGenesisUsingPeerTaskSystem() throws Exception { // set merge flag to false, otherwise this test can fail if a merge test runs first - MergeConfigOptions.setMergeEnabled(false); + MergeConfiguration.setMergeEnabled(false); syncFromGenesis(SyncMode.FAST, getFastSyncGenesis(), true); } diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/task/GetReceiptsFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/task/GetReceiptsFromPeerTask.java index cb84f82033..544f73b782 100644 --- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/task/GetReceiptsFromPeerTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/task/GetReceiptsFromPeerTask.java @@ -103,7 +103,7 @@ public class GetReceiptsFromPeerTask } @Override - public Collection getPeerTaskBehaviors() { + public Collection getPeerTaskRetryBehaviors() { return List.of( PeerTaskRetryBehavior.RETRY_WITH_OTHER_PEERS, PeerTaskRetryBehavior.RETRY_WITH_SAME_PEER); }