Rename MergeOptions to MergeConfigOptions to follow the standard (#3451)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
hyperledger · Feb 17, 2022 · 8fc7cdf · 8fc7cdf
1 parent 629d986
commit 8fc7cdf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MergeOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MergeOptions.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.cli.options.unstable;
 
-import static org.hyperledger.besu.config.experimental.MergeOptions.setMergeEnabled;
+import static org.hyperledger.besu.config.experimental.MergeConfigOptions.setMergeEnabled;
 
 import java.util.Stack;
 

diff --git a/...li/options/unstable/MergeOptionsTest.java → ...ions/unstable/MergeConfigOptionsTest.java b/...li/options/unstable/MergeOptionsTest.java → ...ions/unstable/MergeConfigOptionsTest.java
@@ -17,6 +17,8 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 
+import org.hyperledger.besu.config.experimental.MergeConfigOptions;
+
 import java.util.Stack;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -26,7 +28,7 @@
 
 @SuppressWarnings({"JdkObsolete"})
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class MergeOptionsTest {
+public class MergeConfigOptionsTest {
 
   @Test
   public void shouldBeDisabledByDefault() {
@@ -41,20 +43,19 @@ public void shouldBeEnabledFromCliConsumer() {
     mockStack.push("true");
     new MergeOptions.MergeConfigConsumer().consumeParameters(mockStack, null, null);
 
-    assertThat(org.hyperledger.besu.config.experimental.MergeOptions.isMergeEnabled()).isTrue();
+    assertThat(MergeConfigOptions.isMergeEnabled()).isTrue();
   }
 
   @Test
   public void shouldDoWithMergeEnabled() {
     final AtomicBoolean check = new AtomicBoolean(false);
-    org.hyperledger.besu.config.experimental.MergeOptions.doIfMergeEnabled((() -> check.set(true)));
+    MergeConfigOptions.doIfMergeEnabled((() -> check.set(true)));
     assertThat(check.get()).isTrue();
   }
 
   @Test
   public void shouldThrowOnReconfigure() {
-    assertThatThrownBy(
-            () -> org.hyperledger.besu.config.experimental.MergeOptions.setMergeEnabled(false))
+    assertThatThrownBy(() -> MergeConfigOptions.setMergeEnabled(false))
         .isInstanceOf(RuntimeException.class);
   }
 }
diff --git a/...esu/config/experimental/MergeOptions.java → ...nfig/experimental/MergeConfigOptions.java b/...esu/config/experimental/MergeOptions.java → ...nfig/experimental/MergeConfigOptions.java
@@ -17,7 +17,7 @@
 import java.util.Optional;
 
 /** For now there is a static config that is driven by a command line option. */
-public class MergeOptions {
+public class MergeConfigOptions {
   private static Optional<Boolean> mergeEnabled = Optional.empty();
 
   public static void setMergeEnabled(final boolean bool) {

diff --git a/...ation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java b/...ation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.blockcreation;
 
-import org.hyperledger.besu.config.experimental.MergeOptions;
+import org.hyperledger.besu.config.experimental.MergeConfigOptions;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
@@ -189,7 +189,7 @@ protected Block createBlock(
               .populateFrom(processableBlockHeader)
               .ommersHash(
                   BodyValidation.ommersHash(
-                      MergeOptions.isMergeEnabled() ? Collections.emptyList() : ommers))
+                      MergeConfigOptions.isMergeEnabled() ? Collections.emptyList() : ommers))
               .stateRoot(disposableWorldState.rootHash())
               .transactionsRoot(
                   BodyValidation.transactionsRoot(transactionResults.getTransactions()))

diff --git a/...kcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWMinerExecutor.java b/...kcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWMinerExecutor.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.blockcreation;
 
-import org.hyperledger.besu.config.experimental.MergeOptions;
+import org.hyperledger.besu.config.experimental.MergeConfigOptions;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
@@ -85,7 +85,7 @@ public PoWBlockMiner createMiner(
     final Function<BlockHeader, PoWBlockCreator> blockCreator =
         (header) ->
             new PoWBlockCreator(
-                coinbase.orElseGet(() -> MergeOptions.isMergeEnabled() ? Address.ZERO : null),
+                coinbase.orElseGet(() -> MergeConfigOptions.isMergeEnabled() ? Address.ZERO : null),
                 () -> targetGasLimit.map(AtomicLong::longValue),
                 parent -> extraData,
                 pendingTransactions,