fixed conflicts

Signed-off-by: Paul Harris <[email protected]>
Consensys · Jul 9, 2024 · 9182be3 · 9182be3
1 parent 4e95c21
commit 9182be3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/...e-tests/src/referenceTest/java/tech/pegasys/teku/reference/ManualReferenceTestRunner.java b/...e-tests/src/referenceTest/java/tech/pegasys/teku/reference/ManualReferenceTestRunner.java
@@ -56,7 +56,7 @@ public class ManualReferenceTestRunner extends Eth2ReferenceTestCase {
    *
    * <p>May be overridden by the ENV_MILESTONE environment variable.
    */
-  private static final String MILESTONE = "";
+  private static final String MILESTONE = "electra";
 
   /**
    * Filter tests to run only those where the display name contains this string.

diff --git a/...c/main/java/tech/pegasys/teku/spec/logic/versions/electra/helpers/MiscHelpersElectra.java b/...c/main/java/tech/pegasys/teku/spec/logic/versions/electra/helpers/MiscHelpersElectra.java
@@ -16,7 +16,6 @@
 import it.unimi.dsi.fastutil.ints.IntList;
 import java.util.Optional;
 import org.apache.tuweni.bytes.Bytes32;
-import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.config.SpecConfigDeneb;
 import tech.pegasys.teku.spec.config.SpecConfigElectra;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
@@ -73,9 +72,4 @@ public boolean isFormerDepositMechanismDisabled(final BeaconState state) {
         .getEth1DepositIndex()
         .equals(BeaconStateElectra.required(state).getDepositRequestsStartIndex());
   }
-
-  @Override
-  protected UInt64 getProposerMaxEffectiveBalance() {
-    return SpecConfigElectra.required(specConfig).getMaxEffectiveBalanceElectra();
-  }
 }
diff --git a/...st/java/tech/pegasys/teku/spec/logic/versions/electra/helpers/MiscHelpersElectraTest.java b/...st/java/tech/pegasys/teku/spec/logic/versions/electra/helpers/MiscHelpersElectraTest.java
@@ -19,8 +19,6 @@
 import static org.mockito.Mockito.verify;
 import static tech.pegasys.teku.spec.logic.common.helpers.MathHelpers.uint64ToBytes;
 
-import it.unimi.dsi.fastutil.ints.IntList;
-import org.apache.tuweni.bytes.Bytes32;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 import org.apache.tuweni.bytes.Bytes32;
@@ -31,8 +29,8 @@
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
 import tech.pegasys.teku.spec.config.SpecConfigElectra;
-import tech.pegasys.teku.spec.datastructures.state.BeaconStateTestBuilder;
 import tech.pegasys.teku.spec.constants.Domain;
+import tech.pegasys.teku.spec.datastructures.state.BeaconStateTestBuilder;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.electra.BeaconStateElectra;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.electra.MutableBeaconStateElectra;
@@ -136,7 +134,7 @@ void consolidatedValidatorsMoreLikelyToPropose() {
     assertThat(proposerIndexCount).isEqualTo(4);
   }
 
-  private BeaconState randomStateWithConsolidatedValidator(int consolidationAmount) {
+  private BeaconState randomStateWithConsolidatedValidator(final int consolidationAmount) {
     final BeaconState preState = dataStructureUtil.randomBeaconState(8);
     return BeaconStateElectra.required(preState)
         .updated(