Invert validatorActiveLongEnough check to be more clear (Consensys#8196)

courtneyeh · Apr 15, 2024 · b549a70 · b549a70
1 parent 6a84100
commit b549a70
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.../main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java b/.../main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java
@@ -158,15 +158,15 @@ public void processExecutionLayerExits(
           final Validator validator = state.getValidators().get(validatorIndex);
 
           // Check if validator has eth1 credentials
-          boolean isExecutionAddress = predicates.hasEth1WithdrawalCredential(validator);
+          final boolean isExecutionAddress = predicates.hasEth1WithdrawalCredential(validator);
           if (!isExecutionAddress) {
             return;
           }
 
           // Check exit source_address matches validator eth1 withdrawal credentials
           final Bytes20 executionAddress =
               new Bytes20(validator.getWithdrawalCredentials().slice(12));
-          boolean isCorrectSourceAddress = executionAddress.equals(exit.getSourceAddress());
+          final boolean isCorrectSourceAddress = executionAddress.equals(exit.getSourceAddress());
           if (!isCorrectSourceAddress) {
             return;
           }
@@ -178,16 +178,16 @@ public void processExecutionLayerExits(
           }
 
           // Check if validator has already initiated exit
-          boolean hasInitiatedExit = !validator.getExitEpoch().equals(FAR_FUTURE_EPOCH);
+          final boolean hasInitiatedExit = !validator.getExitEpoch().equals(FAR_FUTURE_EPOCH);
           if (hasInitiatedExit) {
             return;
           }
 
           // Check if validator has been active long enough
           final boolean validatorActiveLongEnough =
-              currentEpoch.isLessThan(
+              currentEpoch.isGreaterThanOrEqualTo(
                   validator.getActivationEpoch().plus(specConfig.getShardCommitteePeriod()));
-          if (validatorActiveLongEnough) {
+          if (!validatorActiveLongEnough) {
             return;
           }