From 62e4e24c804944432156fd560ecd06a81ca1cb2a Mon Sep 17 00:00:00 2001 From: amsmota Date: Fri, 20 Sep 2024 14:54:22 +0100 Subject: [PATCH] Fixed conflicts from merge, implemented suggested changes, reverted gradle props. Signed-off-by: amsmota --- .../test/java/org/hyperledger/besu/cli/CommandTestAbstract.java | 2 +- .../org/hyperledger/besu/config/JsonBftConfigOptionsTest.java | 2 +- 2 files changed, 2 insertions(+), 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 index fc09ebaba5d..65e51c92139 100644 --- 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 index db7d3957908..bbb4c4a6ceb 100644 --- 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(); }