[PAN-2797] Refactor experimental CLI options

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java

@@ -20,7 +20,7 @@
 import tech.pegasys.pantheon.controller.KeyPairUtil;
 import tech.pegasys.pantheon.controller.PantheonController;
 import tech.pegasys.pantheon.controller.PantheonControllerBuilder;
-import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
+import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration;
 import tech.pegasys.pantheon.ethereum.graphql.GraphQLConfiguration;
@@ -115,8 +115,8 @@ public void startNode(final PantheonNode node) {
               .nodePrivateKeyFile(KeyPairUtil.getDefaultKeyFile(node.homeDirectory()))
               .metricsSystem(noOpMetricsSystem)
               .transactionPoolConfiguration(TransactionPoolConfiguration.builder().build())
-              .rocksDbConfiguration(new RocksDbConfiguration.Builder().databaseDir(tempDir).build())
-              .ethereumWireProtocolConfiguration(EthereumWireProtocolConfiguration.defaultConfig())
+              .rocksDbConfiguration(RocksDbConfiguration.builder().databaseDir(tempDir).build())
+              .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
               .clock(Clock.systemUTC())
               .build();
     } catch (final IOException e) {

consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreatorTest.java

@@ -42,6 +42,7 @@
 import tech.pegasys.pantheon.ethereum.core.Util;
 import tech.pegasys.pantheon.ethereum.core.Wei;
 import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions;
+import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
 import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive;
 import tech.pegasys.pantheon.metrics.MetricsSystem;
@@ -114,7 +115,7 @@ public void proposerAddressCanBeExtractFromAConstructedBlock() {
             coinbase,
             parent -> extraData,
             new PendingTransactions(
-                PendingTransactions.DEFAULT_TX_RETENTION_HOURS,
+                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 5,
                 TestClock.fixed(),
                 metricsSystem),
@@ -145,7 +146,7 @@ public void insertsValidVoteIntoConstructedBlock() {
             coinbase,
             parent -> extraData,
             new PendingTransactions(
-                PendingTransactions.DEFAULT_TX_RETENTION_HOURS,
+                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 5,
                 TestClock.fixed(),
                 metricsSystem),
@@ -175,7 +176,7 @@ public void insertsNoVoteWhenAuthInValidators() {
             coinbase,
             parent -> extraData,
             new PendingTransactions(
-                PendingTransactions.DEFAULT_TX_RETENTION_HOURS,
+                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 5,
                 TestClock.fixed(),
                 metricsSystem),
@@ -208,7 +209,7 @@ public void insertsNoVoteWhenAtEpoch() {
             coinbase,
             parent -> extraData,
             new PendingTransactions(
-                PendingTransactions.DEFAULT_TX_RETENTION_HOURS,
+                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 5,
                 TestClock.fixed(),
                 metricsSystem),

consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutorTest.java

@@ -37,6 +37,7 @@
 import tech.pegasys.pantheon.ethereum.core.Util;
 import tech.pegasys.pantheon.ethereum.core.Wei;
 import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions;
+import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration;
 import tech.pegasys.pantheon.metrics.MetricsSystem;
 import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem;
 import tech.pegasys.pantheon.testutil.TestClock;
@@ -91,7 +92,7 @@ public void extraDataCreatedOnEpochBlocksContainsValidators() {
             Executors.newSingleThreadExecutor(),
             CliqueProtocolSchedule.create(GENESIS_CONFIG_OPTIONS, proposerKeyPair),
             new PendingTransactions(
-                PendingTransactions.DEFAULT_TX_RETENTION_HOURS,
+                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 1,
                 TestClock.fixed(),
                 metricsSystem),
@@ -128,7 +129,7 @@ public void extraDataForNonEpochBlocksDoesNotContainValidaors() {
             Executors.newSingleThreadExecutor(),
             CliqueProtocolSchedule.create(GENESIS_CONFIG_OPTIONS, proposerKeyPair),
             new PendingTransactions(
-                PendingTransactions.DEFAULT_TX_RETENTION_HOURS,
+                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 1,
                 TestClock.fixed(),
                 metricsSystem),
@@ -165,7 +166,7 @@ public void shouldUseLatestVanityData() {
             Executors.newSingleThreadExecutor(),
             CliqueProtocolSchedule.create(GENESIS_CONFIG_OPTIONS, proposerKeyPair),
             new PendingTransactions(
-                PendingTransactions.DEFAULT_TX_RETENTION_HOURS,
+                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 1,
                 TestClock.fixed(),
                 metricsSystem),

consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/TestContextBuilder.java

@@ -62,6 +62,7 @@
 import tech.pegasys.pantheon.ethereum.core.Util;
 import tech.pegasys.pantheon.ethereum.core.Wei;
 import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions;
+import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
 import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive;
 import tech.pegasys.pantheon.metrics.MetricsSystem;
@@ -285,7 +286,7 @@ private static ControllerAndState createControllerAndFinalState(
 
     final PendingTransactions pendingTransactions =
         new PendingTransactions(
-            PendingTransactions.DEFAULT_TX_RETENTION_HOURS, 1, clock, metricsSystem);
+            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS, 1, clock, metricsSystem);
 
     final IbftBlockCreatorFactory blockCreatorFactory =
         new IbftBlockCreatorFactory(

consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorTest.java

@@ -34,6 +34,7 @@
 import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture;
 import tech.pegasys.pantheon.ethereum.core.Wei;
 import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions;
+import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration;
 import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator;
 import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
@@ -83,7 +84,10 @@ public void createdBlockPassesValidationRulesAndHasAppropriateHashAndMixHash() {
 
     final PendingTransactions pendingTransactions =
         new PendingTransactions(
-            PendingTransactions.DEFAULT_TX_RETENTION_HOURS, 1, TestClock.fixed(), metricsSystem);
+            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
+            1,
+            TestClock.fixed(),
+            metricsSystem);
 
     final IbftBlockCreator blockCreator =
         new IbftBlockCreator(

consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/protocol/Istanbul64ProtocolManager.java

@@ -15,7 +15,7 @@
 import static java.util.Collections.singletonList;
 
 import tech.pegasys.pantheon.ethereum.chain.Blockchain;
-import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
+import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager;
 import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability;
 import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive;
@@ -37,7 +37,7 @@ public Istanbul64ProtocolManager(
       final int computationWorkers,
       final Clock clock,
       final MetricsSystem metricsSystem,
-      final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration) {
+      final EthProtocolConfiguration ethereumWireProtocolConfiguration) {
     super(
         blockchain,
         worldStateArchive,

consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java

@@ -34,6 +34,7 @@
 import tech.pegasys.pantheon.ethereum.core.Hash;
 import tech.pegasys.pantheon.ethereum.core.Wei;
 import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions;
+import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration;
 import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator;
 import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
@@ -98,7 +99,7 @@ public void headerProducedPassesValidationRules() {
                         initialValidatorList)
                     .encode(),
             new PendingTransactions(
-                PendingTransactions.DEFAULT_TX_RETENTION_HOURS,
+                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 1,
                 TestClock.fixed(),
                 metricsSystem),

ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelectorTest.java

@@ -37,6 +37,7 @@
 import tech.pegasys.pantheon.ethereum.core.WorldUpdater;
 import tech.pegasys.pantheon.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule;
 import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions;
+import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration;
 import tech.pegasys.pantheon.ethereum.mainnet.MainnetTransactionProcessor;
 import tech.pegasys.pantheon.ethereum.mainnet.MainnetTransactionProcessor.Result;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
@@ -68,7 +69,10 @@ public class BlockTransactionSelectorTest {
 
   private final PendingTransactions pendingTransactions =
       new PendingTransactions(
-          PendingTransactions.DEFAULT_TX_RETENTION_HOURS, 5, TestClock.fixed(), metricsSystem);
+          TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
+          5,
+          TestClock.fixed(),
+          metricsSystem);
   private final Blockchain blockchain = new TestBlockchain();
   private final DefaultMutableWorldState worldState = inMemoryWorldState();
   private final Supplier<Boolean> isCancelled = () -> false;

ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockCreatorTest.java

@@ -19,6 +19,7 @@
 import tech.pegasys.pantheon.ethereum.core.PrivacyParameters;
 import tech.pegasys.pantheon.ethereum.core.Wei;
 import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions;
+import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration;
 import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolver;
 import tech.pegasys.pantheon.ethereum.mainnet.EthHasher.Light;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolScheduleBuilder;
@@ -66,7 +67,10 @@ public void createMainnetBlock1() throws IOException {
 
     final PendingTransactions pendingTransactions =
         new PendingTransactions(
-            PendingTransactions.DEFAULT_TX_RETENTION_HOURS, 1, TestClock.fixed(), metricsSystem);
+            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
+            1,
+            TestClock.fixed(),
+            metricsSystem);
 
     final EthHashBlockCreator blockCreator =
         new EthHashBlockCreator(

ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutorTest.java

@@ -17,6 +17,7 @@
 import tech.pegasys.pantheon.ethereum.core.MiningParameters;
 import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder;
 import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions;
+import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration;
 import tech.pegasys.pantheon.metrics.MetricsSystem;
 import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem;
 import tech.pegasys.pantheon.testutil.TestClock;
@@ -36,7 +37,10 @@ public void startingMiningWithoutCoinbaseThrowsException() {
 
     final PendingTransactions pendingTransactions =
         new PendingTransactions(
-            PendingTransactions.DEFAULT_TX_RETENTION_HOURS, 1, TestClock.fixed(), metricsSystem);
+            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
+            1,
+            TestClock.fixed(),
+            metricsSystem);
 
     final EthHashMinerExecutor executor =
         new EthHashMinerExecutor(
@@ -58,7 +62,10 @@ public void settingCoinbaseToNullThrowsException() {
 
     final PendingTransactions pendingTransactions =
         new PendingTransactions(
-            PendingTransactions.DEFAULT_TX_RETENTION_HOURS, 1, TestClock.fixed(), metricsSystem);
+            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
+            1,
+            TestClock.fixed(),
+            metricsSystem);
 
     final EthHashMinerExecutor executor =
         new EthHashMinerExecutor(

ethereum/core/src/jmh/java/tech/pegasys/pantheon/ethereum/vm/operations/OperationBenchmarkHelper.java

@@ -53,7 +53,7 @@ public static OperationBenchmarkHelper create() throws IOException {
     final Path storageDirectory = Files.createTempDirectory("benchmark");
     final KeyValueStorage keyValueStorage =
         RocksDbKeyValueStorage.create(
-            new RocksDbConfiguration.Builder().databaseDir(storageDirectory).build(),
+            RocksDbConfiguration.builder().databaseDir(storageDirectory).build(),
             new NoOpMetricsSystem());
 
     final ExecutionContextTestFixture executionContext =

ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PrivacyParameters.java

@@ -176,7 +176,7 @@ public PrivacyParameters build() throws IOException {
         Path privateDbPath = dataDir.resolve(PRIVATE_DATABASE_PATH);
         StorageProvider privateStorageProvider =
             RocksDbStorageProvider.create(
-                new RocksDbConfiguration.Builder()
+                RocksDbConfiguration.builder()
                     .databaseDir(privateDbPath)
                     .label("private_state")
                     .build(),

ethereum/eth/build.gradle

@@ -36,7 +36,6 @@ dependencies {
   implementation project(':services:pipeline')
   implementation project(':services:tasks')
 
-  implementation 'info.picocli:picocli'
   implementation 'io.vertx:vertx-core'
   implementation 'com.google.guava:guava'
 

ethereum/eth/src/jmh/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloaderBenchmark.java

@@ -81,17 +81,17 @@ public void setUpUnchangedState() throws Exception {
     ethProtocolManager =
         EthProtocolManagerTestUtil.create(
             new EthScheduler(
-                syncConfig.downloaderParallelism(),
-                syncConfig.transactionsParallelism(),
-                syncConfig.computationParallelism(),
+                syncConfig.getDownloaderParallelism(),
+                syncConfig.getTransactionsParallelism(),
+                syncConfig.getComputationParallelism(),
                 metricsSystem));
 
     peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, blockHeader.getNumber());
 
     final EthContext ethContext = ethProtocolManager.ethContext();
     storageProvider =
         RocksDbStorageProvider.create(
-            new RocksDbConfiguration.Builder().databaseDir(tempDir.resolve("database")).build(),
+            RocksDbConfiguration.builder().databaseDir(tempDir.resolve("database")).build(),
             metricsSystem);
     worldStateStorage = storageProvider.createWorldStateStorage();
 

ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/EthereumWireProtocolConfiguration.java → ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/EthProtocolConfiguration.java

@@ -17,9 +17,8 @@
 import java.util.Objects;
 
 import com.google.common.base.MoreObjects;
-import picocli.CommandLine;
 
-public class EthereumWireProtocolConfiguration {
+public class EthProtocolConfiguration {
 
   public static final int DEFAULT_MAX_GET_BLOCK_HEADERS = 192;
   public static final int DEFAULT_MAX_GET_BLOCK_BODIES = 128;
@@ -31,7 +30,7 @@ public class EthereumWireProtocolConfiguration {
   private final int maxGetReceipts;
   private final int maxGetNodeData;
 
-  public EthereumWireProtocolConfiguration(
+  public EthProtocolConfiguration(
       final int maxGetBlockHeaders,
       final int maxGetBlockBodies,
       final int maxGetReceipts,
@@ -42,8 +41,8 @@ public EthereumWireProtocolConfiguration(
     this.maxGetNodeData = maxGetNodeData;
   }
 
-  public static EthereumWireProtocolConfiguration defaultConfig() {
-    return new EthereumWireProtocolConfiguration(
+  public static EthProtocolConfiguration defaultConfig() {
+    return new EthProtocolConfiguration(
         DEFAULT_MAX_GET_BLOCK_HEADERS,
         DEFAULT_MAX_GET_BLOCK_BODIES,
         DEFAULT_MAX_GET_RECEIPTS,
@@ -78,7 +77,7 @@ public boolean equals(final Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    final EthereumWireProtocolConfiguration that = (EthereumWireProtocolConfiguration) o;
+    final EthProtocolConfiguration that = (EthProtocolConfiguration) o;
     return maxGetBlockHeaders == that.maxGetBlockHeaders
         && maxGetBlockBodies == that.maxGetBlockBodies
         && maxGetReceipts == that.maxGetReceipts
@@ -101,41 +100,17 @@ public String toString() {
   }
 
   public static class Builder {
-    @CommandLine.Option(
-        hidden = true,
-        names = {"--Xewp-max-get-headers"},
-        paramLabel = "<INTEGER>",
-        description =
-            "Maximum request limit for Ethereum Wire Protocol GET_BLOCK_HEADERS. (default: ${DEFAULT-VALUE})")
     private PositiveNumber maxGetBlockHeaders =
-        PositiveNumber.fromInt(EthereumWireProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_HEADERS);
-
-    @CommandLine.Option(
-        hidden = true,
-        names = {"--Xewp-max-get-bodies"},
-        paramLabel = "<INTEGER>",
-        description =
-            "Maximum request limit for Ethereum Wire Protocol GET_BLOCK_BODIES. (default: ${DEFAULT-VALUE})")
+        PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_HEADERS);
+
     private PositiveNumber maxGetBlockBodies =
-        PositiveNumber.fromInt(EthereumWireProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_BODIES);
-
-    @CommandLine.Option(
-        hidden = true,
-        names = {"--Xewp-max-get-receipts"},
-        paramLabel = "<INTEGER>",
-        description =
-            "Maximum request limit for Ethereum Wire Protocol GET_RECEIPTS. (default: ${DEFAULT-VALUE})")
+        PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_BODIES);
+
     private PositiveNumber maxGetReceipts =
-        PositiveNumber.fromInt(EthereumWireProtocolConfiguration.DEFAULT_MAX_GET_RECEIPTS);
-
-    @CommandLine.Option(
-        hidden = true,
-        names = {"--Xewp-max-get-node-data"},
-        paramLabel = "<INTEGER>",
-        description =
-            "Maximum request limit for Ethereum Wire Protocol GET_NODE_DATA. (default: ${DEFAULT-VALUE})")
+        PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_GET_RECEIPTS);
+
     private PositiveNumber maxGetNodeData =
-        PositiveNumber.fromInt(EthereumWireProtocolConfiguration.DEFAULT_MAX_GET_NODE_DATA);
+        PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_GET_NODE_DATA);
 
     public Builder maxGetBlockHeaders(final PositiveNumber maxGetBlockHeaders) {
       this.maxGetBlockHeaders = maxGetBlockHeaders;
@@ -157,8 +132,8 @@ public Builder maxGetNodeData(final PositiveNumber maxGetNodeData) {
       return this;
     }
 
-    public EthereumWireProtocolConfiguration build() {
-      return new EthereumWireProtocolConfiguration(
+    public EthProtocolConfiguration build() {
+      return new EthProtocolConfiguration(
           maxGetBlockHeaders.getValue(),
           maxGetBlockBodies.getValue(),
           maxGetReceipts.getValue(),