fix rebasing conflict

Consensys · Feb 2, 2024 · c598b14 · c598b14
1 parent 3978a82
commit c598b14
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/...aconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java b/...aconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java
@@ -688,19 +688,6 @@ protected void initSlashingEventsSubscriptions() {
     }
   }
 
-  protected void initSlashingEventsSubscriptions() {
-    if (beaconConfig.validatorConfig().isShutdownWhenValidatorSlashedEnabled()) {
-      final ValidatorTimingChannel validatorTimingChannel =
-          eventChannels.getPublisher(ValidatorTimingChannel.class);
-      attesterSlashingPool.subscribeOperationAdded(
-          (operation, validationStatus, fromNetwork) ->
-              validatorTimingChannel.onAttesterSlashing(operation));
-      proposerSlashingPool.subscribeOperationAdded(
-          (operation, validationStatus, fromNetwork) ->
-              validatorTimingChannel.onProposerSlashing(operation));
-    }
-  }
-
   protected void initVoluntaryExitPool() {
     LOG.debug("BeaconChainController.initVoluntaryExitPool()");
     VoluntaryExitValidator validator = new VoluntaryExitValidator(spec, recentChainData);

diff --git a/...r/client/src/test/java/tech/pegasys/teku/validator/client/ValidatorTimingActionsTest.java b/...r/client/src/test/java/tech/pegasys/teku/validator/client/ValidatorTimingActionsTest.java
@@ -68,7 +68,7 @@ public class ValidatorTimingActionsTest {
           Map.entry(key4, ValidatorStatus.exited_slashed));
 
   @Test
-  public void shouldPrintAlertForSlashedValidators_AttesterSlashing() {
+  public void shouldTriggerSlashingActionForSlashedValidators_AttesterSlashing() {
     final ValidatorTimingActions validatorTimingActions =
         new ValidatorTimingActions(
             validatorIndexProvider, delegates, spec, metricsSystem, maybeSlashedValidatorAction);