Fixed conflicts from merge, implemented suggested changes, reverted g…

…radle props. Signed-off-by: amsmota <amsmota@gmail.com>
hyperledger · Sep 20, 2024 · 62e4e24 · 62e4e24
1 parent 0c6fc85
commit 62e4e24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java b/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java
@@ -149,7 +149,7 @@ public abstract class CommandTestAbstract {
  .put(
  "qbft",
  new JsonObject()
- .put("emptyblockperiodseconds", POA_EMPTY_BLOCK_PERIOD_SECONDS)));
+ .put("xemptyblockperiodseconds", POA_EMPTY_BLOCK_PERIOD_SECONDS)));
  protected static final JsonObject VALID_GENESIS_IBFT2_POST_LONDON =
  (new JsonObject())
  .put(

diff --git a/config/src/test/java/org/hyperledger/besu/config/JsonBftConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/JsonBftConfigOptionsTest.java
@@ -104,7 +104,7 @@ public void shouldThrowOnNonPositiveBlockPeriod() {
  @Test
  public void shouldNotThrowOnNonPositiveEmptyBlockPeriod() {
  // can be 0 to be compatible with older versions
- final BftConfigOptions config = fromConfigOptions(singletonMap("emptyblockperiodseconds", 0));
+ final BftConfigOptions config = fromConfigOptions(singletonMap("xemptyblockperiodseconds", 0));
  assertThatCode(() -> config.getEmptyBlockPeriodSeconds()).doesNotThrowAnyException();
  }