change set to list

StefanBratanov · Nov 2, 2023 · d4a2bc0 · d4a2bc0
1 parent 1282e05
commit d4a2bc0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 23 deletions.
diff --git a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/peers/DefaultEth2Peer.java b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/peers/DefaultEth2Peer.java
@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
 import org.apache.logging.log4j.LogManager;
@@ -280,21 +279,23 @@ public SafeFuture<Optional<BlobSidecar>> requestBlobSidecarByRoot(
     return rpcMethods
         .blobSidecarsByRoot()
         .map(
-            method ->
-                requestOptionalItem(
-                        method,
-                        new BlobSidecarsByRootRequestMessage(
-                            blobSidecarsByRootRequestMessageSchema.get(),
-                            Collections.singletonList(blobIdentifier)))
-                    .thenPeek(
-                        maybeBlobSidecar ->
-                            maybeBlobSidecar.ifPresent(
-                                blobSidecar -> {
-                                  final BlobSidecarsByRootValidator validator =
-                                      new BlobSidecarsByRootValidator(
-                                          this, spec, kzg, Set.of(blobIdentifier));
-                                  validator.validate(blobSidecar);
-                                })))
+            method -> {
+              final List<BlobIdentifier> blobIdentifiers =
+                  Collections.singletonList(blobIdentifier);
+              return requestOptionalItem(
+                      method,
+                      new BlobSidecarsByRootRequestMessage(
+                          blobSidecarsByRootRequestMessageSchema.get(), blobIdentifiers))
+                  .thenPeek(
+                      maybeBlobSidecar ->
+                          maybeBlobSidecar.ifPresent(
+                              blobSidecar -> {
+                                final BlobSidecarsByRootValidator validator =
+                                    new BlobSidecarsByRootValidator(
+                                        this, spec, kzg, blobIdentifiers);
+                                validator.validate(blobSidecar);
+                              }));
+            })
         .orElse(failWithUnsupportedMethodException("BlobSidecarsByRoot"));
   }
 

diff --git a/...ech/pegasys/teku/networking/eth2/rpc/beaconchain/methods/BlobSidecarsByRootValidator.java b/...ech/pegasys/teku/networking/eth2/rpc/beaconchain/methods/BlobSidecarsByRootValidator.java
@@ -13,7 +13,7 @@
 
 package tech.pegasys.teku.networking.eth2.rpc.beaconchain.methods;
 
-import java.util.Set;
+import java.util.List;
 import tech.pegasys.teku.kzg.KZG;
 import tech.pegasys.teku.networking.eth2.rpc.beaconchain.methods.BlobSidecarsResponseInvalidResponseException.InvalidResponseType;
 import tech.pegasys.teku.networking.p2p.peer.Peer;
@@ -23,13 +23,13 @@
 
 public class BlobSidecarsByRootValidator extends AbstractBlobSidecarsValidator {
 
-  private final Set<BlobIdentifier> expectedBlobIdentifiers;
+  private final List<BlobIdentifier> expectedBlobIdentifiers;
 
   public BlobSidecarsByRootValidator(
       final Peer peer,
       final Spec spec,
       final KZG kzg,
-      final Set<BlobIdentifier> expectedBlobIdentifiers) {
+      final List<BlobIdentifier> expectedBlobIdentifiers) {
     super(peer, spec, kzg);
     this.expectedBlobIdentifiers = expectedBlobIdentifiers;
   }

diff --git a/...pegasys/teku/networking/eth2/rpc/beaconchain/methods/BlobSidecarsByRootValidatorTest.java b/...pegasys/teku/networking/eth2/rpc/beaconchain/methods/BlobSidecarsByRootValidatorTest.java
@@ -19,7 +19,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.Set;
+import java.util.List;
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -51,7 +51,7 @@ void blobSidecarIsCorrect() {
     final BlobSidecar blobSidecar1 =
         dataStructureUtil.randomBlobSidecar(UInt64.ONE, blockRoot1, Bytes32.ZERO, UInt64.ZERO);
 
-    validator = new BlobSidecarsByRootValidator(peer, spec, kzg, Set.of(blobIdentifier1));
+    validator = new BlobSidecarsByRootValidator(peer, spec, kzg, List.of(blobIdentifier1));
     assertDoesNotThrow(() -> validator.validate(blobSidecar1));
   }
 
@@ -63,7 +63,7 @@ void blobSidecarIdentifierNotRequested() {
     final BlobSidecar blobSidecar1 =
         dataStructureUtil.randomBlobSidecar(UInt64.ONE, blockRoot1, Bytes32.ZERO, UInt64.ZERO);
 
-    validator = new BlobSidecarsByRootValidator(peer, spec, kzg, Set.of(blobIdentifier2));
+    validator = new BlobSidecarsByRootValidator(peer, spec, kzg, List.of(blobIdentifier2));
     assertThatThrownBy(() -> validator.validate(blobSidecar1))
         .isExactlyInstanceOf(BlobSidecarsResponseInvalidResponseException.class)
         .hasMessageContaining(
@@ -80,7 +80,7 @@ void blobSidecarFailsKzgVerification() {
     final BlobSidecar blobSidecar1 =
         dataStructureUtil.randomBlobSidecar(UInt64.ONE, blockRoot1, Bytes32.ZERO, UInt64.ZERO);
 
-    validator = new BlobSidecarsByRootValidator(peer, spec, kzg, Set.of(blobIdentifier1));
+    validator = new BlobSidecarsByRootValidator(peer, spec, kzg, List.of(blobIdentifier1));
     assertThatThrownBy(() -> validator.validate(blobSidecar1))
         .isExactlyInstanceOf(BlobSidecarsResponseInvalidResponseException.class)
         .hasMessageContaining(