Fixed issues after merge (Issue hyperledger#3810)

Signed-off-by: amsmota <[email protected]>
Citi · Apr 16, 2024 · 04814f9 · 04814f9
1 parent 40f51b8
commit 04814f9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java
@@ -413,7 +413,7 @@ private static MinedBlockObserver blockLogger(
             String.format(
                 "%s %s #%,d / %d tx / %d pending / %,d (%01.1f%%) gas / (%s)",
                 block.getHeader().getCoinbase().equals(localAddress) ? "Produced" : "Imported",
-                block.getBody().getTransactions().size()==0 ? "empty block" : "block",
+                block.getBody().getTransactions().size() == 0 ? "empty block" : "block",
                 block.getHeader().getNumber(),
                 block.getBody().getTransactions().size(),
                 transactionPool.count(),

diff --git a/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java b/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java
@@ -139,20 +139,19 @@ public abstract class CommandTestAbstract {
   private static final Logger TEST_LOGGER = LoggerFactory.getLogger(CommandTestAbstract.class);
 
   protected static final int POA_BLOCK_PERIOD_SECONDS = 5;
-  protected static final int POA_EMPTY_BLOCK_PERIOD_SECONDS = 50; // TODO: IS THIS APPLICABLE FOR POA?
+  protected static final int POA_EMPTY_BLOCK_PERIOD_SECONDS =
+      50; // TODO: IS THIS APPLICABLE FOR POA?
   protected static final JsonObject VALID_GENESIS_QBFT_POST_LONDON =
       (new JsonObject())
           .put(
               "config",
               new JsonObject()
                   .put("londonBlock", 0)
+                  .put("qbft", new JsonObject().put("blockperiodseconds", POA_BLOCK_PERIOD_SECONDS))
                   .put(
                       "qbft",
-                      new JsonObject().put("blockperiodseconds", POA_BLOCK_PERIOD_SECONDS)
-                  .put(
-                      "qbft",
-                      new JsonObject().put("emptyblockperiodseconds", POA_EMPTY_BLOCK_PERIOD_SECONDS)
-                  ));
+                      new JsonObject()
+                          .put("emptyblockperiodseconds", POA_EMPTY_BLOCK_PERIOD_SECONDS)));
   protected static final JsonObject VALID_GENESIS_IBFT2_POST_LONDON =
       (new JsonObject())
           .put(

diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/MiningOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/MiningOptionsTest.java
@@ -307,7 +307,7 @@ public void posBlockCreationMaxTimeOption() {
   @Test
   public void posBlockCreationMaxTimeOutOfAllowedRange() {
     internalTestFailure(
-        "--Xpos-block-creation-max-time must be positive and ≤ 12000",
+        "--Xpos-block-creation-max-time must be positive and less or equal 12000",
         "--Xpos-block-creation-max-time",
         "17000");
   }

diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRound.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRound.java
@@ -142,10 +142,10 @@ public Block createBlock(final long headerTimeStampSeconds) {
   /**
    * Send proposal message.
    *
-   * @param headerTimeStampSeconds the header time stamp seconds
+   * @param block to send
    */
   public void sendProposalMessage(final Block block) {
-    LOG.trace(
+    LOG.debug(
             "Creating proposed block blockHeader={}",
             block.getHeader());
     updateStateWithProposalAndTransmit(block, emptyList(), emptyList());