Fix exit when no validator keys

CHANGELOG.md

@@ -15,3 +15,4 @@ the [releases page](https://github.com/Consensys/teku/releases).
 - Added `--ee-jwt-claim-id` command line option to provide `id` to the execution engine JWT claims
 
 ### Bug Fixes
+- Fixed bug preventing node to startup when using `--exit-when-no-validator-keys-enabled` even with keys present

acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/ValidatorClientServiceAcceptanceTest.java

@@ -22,7 +22,9 @@ public class ValidatorClientServiceAcceptanceTest extends AcceptanceTestBase {
 
   @Test
   void shouldFailWithNoValidatorKeysWhenExitOptionEnabledOnBeaconNode() throws Exception {
-    TekuNode beaconNode = createTekuNode(config -> config.withExitWhenNoValidatorKeysEnabled(true));
+    TekuNode beaconNode =
+        createTekuNode(
+            config -> config.withExitWhenNoValidatorKeysEnabled(true).withInteropValidators(0, 0));
     beaconNode.startWithFailure(
         "No loaded validators when --exit-when-no-validator-keys-enabled option is true");
   }
@@ -32,7 +34,11 @@ void shouldFailWithNoValidatorKeysWhenExitOptionEnabledOnValidatorClient() throw
     TekuNode beaconNode = createTekuNode();
     TekuValidatorNode validatorClient =
         createValidatorNode(
-            config -> config.withBeaconNode(beaconNode).withExitWhenNoValidatorKeysEnabled(true));
+            config ->
+                config
+                    .withBeaconNode(beaconNode)
+                    .withExitWhenNoValidatorKeysEnabled(true)
+                    .withInteropModeDisabled());
     beaconNode.start();
     validatorClient.startWithFailure(
         "No loaded validators when --exit-when-no-validator-keys-enabled option is true");

infrastructure/logging/src/main/java/tech/pegasys/teku/infrastructure/logging/StatusLogger.java

@@ -237,6 +237,15 @@ public void doppelgangerDetectionAlert(final Set<String> doppelgangerPublicKeys)
         String.join(", ", doppelgangerPublicKeys));
   }
 
+  public void exitOnDoppelgangerDetected(final String keys) {
+    log.fatal("Validator doppelganger detected. Public keys: {}. Shutting down...", keys);
+  }
+
+  public void exitOnNoValidatorKeys() {
+    log.fatal(
+        "No loaded validators when --exit-when-no-validator-keys-enabled option is true. Shutting down...");
+  }
+
   public void beginInitializingChainData() {
     log.info("Initializing storage");
   }

teku/src/main/java/tech/pegasys/teku/cli/BeaconNodeCommand.java

@@ -73,7 +73,6 @@
 import tech.pegasys.teku.infrastructure.metrics.TekuMetricCategory;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.storage.server.DatabaseStorageException;
-import tech.pegasys.teku.validator.client.NoValidatorKeysStateException;
 
 @SuppressWarnings("unused")
 @Command(
@@ -353,25 +352,12 @@ public int handleExceptionAndReturnExitCode(final Throwable e) {
       return 2;
     } else {
       reportUnexpectedError(e);
-      if (ExceptionUtil.hasCause(e, NoValidatorKeysStateException.class)) {
-        return 2;
-      }
       return 1;
     }
   }
 
   public void reportUnexpectedError(final Throwable t) {
-    if (ExceptionUtil.hasCause(t, NoValidatorKeysStateException.class)) {
-      getLogger().fatal("Teku failed to start: " + t.getMessage());
-    } else {
-      getLogger().fatal("Teku failed to start", t);
-    }
-    errorWriter.println("Teku failed to start: " + t.getMessage());
-    printUsage(errorWriter);
-  }
-
-  public void reportUnexpectedErrorNoStacktrace(final Throwable t) {
-    getLogger().fatal("Teku failed to start", t.getMessage());
+    getLogger().fatal("Teku failed to start", t);
     errorWriter.println("Teku failed to start: " + t.getMessage());
     printUsage(errorWriter);
   }

validator/client/src/main/java/tech/pegasys/teku/validator/client/ValidatorClientService.java

@@ -13,6 +13,8 @@
 
 package tech.pegasys.teku.validator.client;
 
+import static tech.pegasys.teku.infrastructure.logging.StatusLogger.STATUS_LOG;
+
 import java.net.http.HttpClient;
 import java.nio.file.Path;
 import java.time.Duration;
@@ -218,6 +220,12 @@ public static ValidatorClientService create(
             () -> validatorClientService.initializeValidators(validatorApiChannel, asyncRunner))
         .thenCompose(
             __ -> {
+              if (validatorConfig.isExitWhenNoValidatorKeysEnabled()
+                  && validatorLoader.getOwnedValidators().getActiveValidators().isEmpty()) {
+                STATUS_LOG.exitOnNoValidatorKeys();
+                System.exit(2);
+              }
+
               if (validatorConfig.isDoppelgangerDetectionEnabled()) {
                 validatorClientService.initializeDoppelgangerDetector(
                     asyncRunner,
@@ -270,12 +278,6 @@ public static ValidatorClientService create(
             })
         .always(() -> LOG.trace("Finished starting validator client service."));
 
-    if (validatorConfig.isExitWhenNoValidatorKeysEnabled()
-        && validatorLoader.getOwnedValidators().getActiveValidators().size() == 0) {
-      throw new NoValidatorKeysStateException(
-          "No loaded validators when --exit-when-no-validator-keys-enabled option is true");
-    }
-
     return validatorClientService;
   }
 

validator/client/src/main/java/tech/pegasys/teku/validator/client/doppelganger/DoppelgangerDetectionShutDown.java

@@ -13,20 +13,16 @@
 
 package tech.pegasys.teku.validator.client.doppelganger;
 
+import static tech.pegasys.teku.infrastructure.logging.StatusLogger.STATUS_LOG;
+
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import tech.pegasys.teku.bls.BLSPublicKey;
 
 public class DoppelgangerDetectionShutDown implements DoppelgangerDetectionAction {
-
-  private static final Logger LOG = LogManager.getLogger();
-
   @Override
   public void perform(final List<BLSPublicKey> doppelgangers) {
-    LOG.info(
-        "Validator doppelganger detected. Public keys: {}. Shutting down...",
+    STATUS_LOG.exitOnDoppelgangerDetected(
         doppelgangers.stream()
             .map(BLSPublicKey::toAbbreviatedString)
             .collect(Collectors.joining(", ")));