refactor slot filtering

Consensys · Jul 16, 2024 · 2c6637a · 2c6637a
1 parent 1d84f37
commit 2c6637a
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/...c/main/java/tech/pegasys/teku/statetransition/attestation/AggregatingAttestationPool.java b/...c/main/java/tech/pegasys/teku/statetransition/attestation/AggregatingAttestationPool.java
@@ -270,7 +270,8 @@ public synchronized SszList<Attestation> getAttestationsForBlock(
   public synchronized List<Attestation> getAttestations(
       final Optional<UInt64> maybeSlot, final Optional<UInt64> maybeCommitteeIndex) {
 
-    final Predicate<Map.Entry<UInt64, Set<Bytes>>> filterForSlot = getSlotFilter(maybeSlot);
+    final Predicate<Map.Entry<UInt64, Set<Bytes>>> filterForSlot =
+        (entry) -> maybeSlot.map(slot -> entry.getKey().equals(slot)).orElse(true);
 
     final Predicate<MatchingDataAttestationGroup> filterForCommitteeIndex =
         (group) ->
@@ -312,18 +313,6 @@ private SchemaDefinitions getSchemaDefinitions(final Optional<UInt64> maybeSlot)
     }
   }
 
-  private Predicate<Map.Entry<UInt64, Set<Bytes>>> getSlotFilter(final Optional<UInt64> maybeSlot) {
-    if (maybeSlot.isPresent()) {
-      return (entry) -> entry.getKey().equals(maybeSlot.get());
-    } else {
-      return (entry) ->
-          recentChainData
-              .getCurrentSlot()
-              .map(currentSlot -> entry.getKey().equals(currentSlot))
-              .orElse(true);
-    }
-  }
-
   private boolean isValid(
       final BeaconState stateAtBlockSlot, final AttestationData attestationData) {
     return spec.validateAttestation(stateAtBlockSlot, attestationData).isEmpty();