Event queue test fixes

Signed-off-by: Matthew Whitehead <[email protected]>
hyperledger · Jun 25, 2024 · 7bd09e3 · 7bd09e3
1 parent f313912
commit 7bd09e3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
@@ -1281,13 +1281,18 @@ public void bonsaiLimitTrieLogsEnabledByDefault() {
   }
 
   @Test
-  public void parsesInvalidDefaultBonsaiLimitTrieLogsWhenFullSyncEnabled() {
+  public void parsesChangesDefaultBonsaiLimitTrieLogsWhenFullSyncEnabled() {
     parseCommand("--sync-mode=FULL");
+    verify(mockControllerBuilder)
+        .dataStorageConfiguration(dataStorageConfigurationArgumentCaptor.capture());
+
+    final DataStorageConfiguration dataStorageConfiguration =
+        dataStorageConfigurationArgumentCaptor.getValue();
+    assertThat(dataStorageConfiguration.getDataStorageFormat()).isEqualTo(BONSAI);
+    assertThat(dataStorageConfiguration.getBonsaiLimitTrieLogsEnabled()).isFalse();
 
-    Mockito.verifyNoInteractions(mockRunnerBuilder);
     assertThat(commandOutput.toString(UTF_8)).isEmpty();
-    assertThat(commandErrorOutput.toString(UTF_8))
-        .contains("Cannot enable --bonsai-limit-trie-logs-enabled with sync-mode FULL");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test

diff --git a/...nsus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftProcessorTest.java b/...nsus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftProcessorTest.java
@@ -130,6 +130,7 @@ public void handlesQueueInterruptGracefully() throws InterruptedException {
   @Test
   public void drainEventsIntoStateMachine() throws InterruptedException {
     final BftEventQueue queue = new BftEventQueue(1000);
+    queue.start();
     final BftProcessor processor = new BftProcessor(queue, mockeEventMultiplexer);
 
     // Start the BftProcessor

diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/RoundTimerTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/RoundTimerTest.java
@@ -45,6 +45,7 @@ public class RoundTimerTest {
   public void initialise() {
     bftExecutors = mock(BftExecutors.class);
     queue = new BftEventQueue(1000);
+    queue.start();
     timer = new RoundTimer(queue, 1, bftExecutors);
   }
 

diff --git a/...ava/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinatorTest.java b/...ava/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinatorTest.java
@@ -56,6 +56,7 @@ public class BftMiningCoordinatorTest {
 
   @BeforeEach
   public void setup() {
+    eventQueue.start();
     bftMiningCoordinator =
         new BftMiningCoordinator(
             bftExecutors, controller, bftProcessor, bftBlockCreatorFactory, blockChain, eventQueue);