[Merge] Unhide merge related CLI options

services/executionengine/src/main/java/tech/pegasys/teku/services/executionengine/ExecutionEngineConfiguration.java

@@ -59,7 +59,7 @@ public String getEndpoint() {
     return endpoint.orElseThrow(
         () ->
             new InvalidConfigurationException(
-                "Invalid configuration. --Xee-endpoint parameter is mandatory when Bellatrix milestone is enabled"));
+                "Invalid configuration. --ee-endpoint parameter is mandatory when Bellatrix milestone is enabled"));
   }
 
   public Optional<String> getJwtSecretFile() {

services/executionengine/src/test/java/tech/pegasys/teku/services/executionengine/ExecutionEngineConfigurationTest.java

@@ -31,7 +31,7 @@ public void shouldThrowExceptionIfNoEeEndpointSpecified() {
     Assertions.assertThatExceptionOfType(InvalidConfigurationException.class)
         .isThrownBy(config::getEndpoint)
         .withMessageContaining(
-            "Invalid configuration. --Xee-endpoint parameter is mandatory when Bellatrix milestone is enabled");
+            "Invalid configuration. --ee-endpoint parameter is mandatory when Bellatrix milestone is enabled");
   }
 
   @Test

teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java

@@ -26,7 +26,7 @@
 public class ExecutionEngineOptions {
 
   @Option(
-      names = {"--Xee-endpoint"},
+      names = {"--ee-endpoint"},
       paramLabel = "<NETWORK>",
       description = "URL for Execution Engine node.",
       arity = "1",
@@ -52,7 +52,7 @@ public class ExecutionEngineOptions {
 
   @Option(
       hidden = true,
-      names = {"--Xee-jwt-secret"},
+      names = {"--ee-jwt-secret-file"},
       paramLabel = "<FILENAME>",
       description =
           "Location of the file specifying the hex-encoded 256 bit secret key to be used for verifying/generating jwt tokens",

teku/src/test/java/tech/pegasys/teku/cli/BeaconNodeCommandTest.java

@@ -342,7 +342,7 @@ private String[] createCliArgs() {
       "0x77f7bED277449F51505a4C54550B074030d989bC",
       "--eth1-endpoint",
       "http://localhost:8545",
-      "--Xee-endpoint",
+      "--ee-endpoint",
       "http://localhost:8550",
       "--metrics-enabled",
       "false",

teku/src/test/java/tech/pegasys/teku/cli/options/Eth2NetworkOptionsTest.java

@@ -57,7 +57,7 @@ void shouldUseAltairForkEpochIfSpecified() {
   void shouldUseBellatrixForkEpochIfSpecified() {
     final TekuConfiguration config =
         getTekuConfigurationFromArguments(
-            "--Xnetwork-bellatrix-fork-epoch", "120000", "--Xee-endpoint", "someEndpoint");
+            "--Xnetwork-bellatrix-fork-epoch", "120000", "--ee-endpoint", "someEndpoint");
     final Spec spec = config.eth2NetworkConfiguration().getSpec();
     assertThat(spec.getForkSchedule().getSpecMilestoneAtEpoch(UInt64.valueOf(119999)))
         .isEqualTo(SpecMilestone.ALTAIR);
@@ -78,7 +78,7 @@ void shouldUseCustomSafeSlotsToImportOptimistically() {
         getTekuConfigurationFromArguments(
             "--Xnetwork-bellatrix-fork-epoch",
             "120000",
-            "--Xee-endpoint",
+            "--ee-endpoint",
             "someEndpoint",
             "--Xnetwork-safe-slots-to-import-optimistically",
             "256");

teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java

@@ -43,7 +43,7 @@ public void shouldReportEEEnabledIfSpecEnablesBellatrix() {
       "0",
       "--Xnetwork-bellatrix-fork-epoch",
       "1",
-      "--Xee-endpoint",
+      "--ee-endpoint",
       "http://example.com:1234/path/"
     };
     final TekuConfiguration config = getTekuConfigurationFromArguments(args);

teku/src/test/resources/complete_config.yaml

@@ -25,7 +25,7 @@ eth1-endpoint: "http://localhost:8545"
 #Xeth1-deposits-from-storage-enabled: true
 
 # execution engine
-Xee-endpoint: "http://localhost:8550"
+ee-endpoint: "http://localhost:8550"
 
 # output
 #Xtransaction-record-directory: "/tmp/teku"

teku/src/test/resources/executionEngineOptions_config.yaml

@@ -1,2 +1,2 @@
 # execution engine
-Xee-endpoint: "http://example.com:1234/path/"
+ee-endpoint: "http://example.com:1234/path/"