fix rebase conflicts

Consensys · Apr 15, 2024 · 43422c1 · 43422c1
1 parent e8656f8
commit 43422c1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigElectra.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigElectra.java
@@ -65,10 +65,6 @@ static SpecConfigElectra required(final SpecConfig specConfig) {
 
   int getMaxExecutionLayerExits();
 
-  int getMaxAttesterSlashingsElectra();
-
-  int getMaxAttestationsElectra();
-
   @Override
   Optional<SpecConfigElectra> toVersionElectra();
 }
diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigElectraImpl.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigElectraImpl.java
@@ -163,11 +163,6 @@ public UInt64 getMaxPerEpochActivationExitChurnLimit() {
     return maxPerEpochActivationExitChurnLimit;
   }
 
-  @Override
-  public int getMaxValidatorsPerAttestation() {
-    return getMaxValidatorsPerCommittee() * getMaxCommitteesPerSlot();
-  }
-
   @Override
   public Optional<SpecConfigElectra> toVersionElectra() {
     return Optional.of(this);