From 22421e89744dac8b43310a823e0e9a75925e7f8d Mon Sep 17 00:00:00 2001
From: Lucas Saldanha <lucas.saldanha@consensys.net>
Date: Tue, 8 Oct 2024 16:33:33 +1300
Subject: [PATCH] Cleaning up (#8683)

---
 .../common/operations/OperationsTestExecutor.java          | 7 ++-----
 .../statetransition/epoch/EpochProcessorElectra.java       | 3 ---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/common/operations/OperationsTestExecutor.java b/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/common/operations/OperationsTestExecutor.java
index 5ac96806316..df11615cc16 100644
--- a/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/common/operations/OperationsTestExecutor.java
+++ b/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/common/operations/OperationsTestExecutor.java
@@ -128,13 +128,10 @@ private enum Operation {
               "operations/withdrawal_request",
               new OperationsTestExecutor<>(
                   "withdrawal_request.ssz_snappy", Operation.WITHDRAWAL_REQUEST))
-          // TODO re-enable consolidation tests (https://github.com/Consensys/teku/issues/8617)
           .put(
               "operations/consolidation_request",
-              //              new OperationsTestExecutor<>(
-              //                  "consolidation_request.ssz_snappy",
-              // Operation.CONSOLIDATION_REQUEST))
-              TestExecutor.IGNORE_TESTS)
+              new OperationsTestExecutor<>(
+                  "consolidation_request.ssz_snappy", Operation.CONSOLIDATION_REQUEST))
           .build();
 
   private final String dataFileName;
diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/electra/statetransition/epoch/EpochProcessorElectra.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/electra/statetransition/epoch/EpochProcessorElectra.java
index 40c4c488339..53079c9a58e 100644
--- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/electra/statetransition/epoch/EpochProcessorElectra.java
+++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/electra/statetransition/epoch/EpochProcessorElectra.java
@@ -167,9 +167,6 @@ public void processEffectiveBalanceUpdates(
     final UInt64 hysteresisDownwardMultiplier = specConfig.getHysteresisDownwardMultiplier();
     final UInt64 hysteresisQuotient = specConfig.getHysteresisQuotient();
     final UInt64 effectiveBalanceIncrement = specConfig.getEffectiveBalanceIncrement();
-    // TODO-lucas Before we were using state.getValidators().size() but it can lead to an
-    // OutOfBoundsException when
-    //  we have new validators being created but not added to ValidatorStatus.
     for (int index = 0; index < statuses.size(); index++) {
       final ValidatorStatus status = statuses.get(index);
       final UInt64 balance = balances.getElement(index);