changes as per feedback

Consensys · May 22, 2023 · 4856090 · 4856090
1 parent e0c5d28
commit 4856090
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/...dator/src/test/java/tech/pegasys/teku/validator/coordinator/AbstractBlockFactoryTest.java b/...dator/src/test/java/tech/pegasys/teku/validator/coordinator/AbstractBlockFactoryTest.java
@@ -288,9 +288,9 @@ protected void prepareDefaultPayload(final Spec spec) {
             .getHeaderOfDefaultPayload();
   }
 
-  protected BlobsBundle prepareBlobsBundle(final Spec spec) {
+  protected BlobsBundle prepareBlobsBundle(final Spec spec, final int count) {
     final DataStructureUtil dataStructureUtil = new DataStructureUtil(spec);
-    final BlobsBundle blobsBundle = dataStructureUtil.randomBlobsBundle();
+    final BlobsBundle blobsBundle = dataStructureUtil.randomBlobsBundle(count);
     this.blobsBundle = blobsBundle;
     return blobsBundle;
   }

diff --git a/...alidator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockFactoryDenebTest.java b/...alidator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockFactoryDenebTest.java
@@ -15,10 +15,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.stream.Collectors;
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
+import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlindedBlobSidecar;
+import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.Blob;
+import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecar;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobsBundle;
 import tech.pegasys.teku.spec.datastructures.blocks.BlindedBlockContainer;
 import tech.pegasys.teku.spec.datastructures.blocks.BlockContainer;
@@ -34,21 +38,25 @@ public class BlockFactoryDenebTest extends AbstractBlockFactoryTest {
   void shouldCreateBlockContentsWhenDenebIsActive() {
 
     prepareDefaultPayload(spec);
-    final BlobsBundle blobsBundle = prepareBlobsBundle(spec);
+    final BlobsBundle blobsBundle = prepareBlobsBundle(spec, 3);
 
     final BlockContainer blockContainer = assertBlockCreated(1, spec, false, false);
 
     assertThat(blockContainer).isInstanceOf(BlockContents.class);
     assertThat(blockContainer.getBlobSidecars())
         .hasValueSatisfying(
-            blobSidecars -> assertThat(blobSidecars).hasSize(blobsBundle.getNumberOfBlobs()));
+            blobSidecars ->
+                assertThat(blobSidecars)
+                    .hasSize(3)
+                    .map(BlobSidecar::getBlob)
+                    .hasSameElementsAs(blobsBundle.getBlobs()));
   }
 
   @Test
   void shouldCreateBlindedBlockContentsWhenDenebIsActiveAndBlindedBlockRequested() {
 
     prepareDefaultPayload(spec);
-    final BlobsBundle blobsBundle = prepareBlobsBundle(spec);
+    final BlobsBundle blobsBundle = prepareBlobsBundle(spec, 3);
 
     final BlockContainer blockContainer = assertBlockCreated(1, spec, false, true);
 
@@ -57,7 +65,13 @@ void shouldCreateBlindedBlockContentsWhenDenebIsActiveAndBlindedBlockRequested()
     assertThat(blindedBlockContainer.getBlindedBlobSidecars())
         .hasValueSatisfying(
             blindedBlobSidecars ->
-                assertThat(blindedBlobSidecars).hasSize(blobsBundle.getNumberOfBlobs()));
+                assertThat(blindedBlobSidecars)
+                    .hasSize(3)
+                    .map(BlindedBlobSidecar::getBlobRoot)
+                    .hasSameElementsAs(
+                        blobsBundle.getBlobs().stream()
+                            .map(Blob::hashTreeRoot)
+                            .collect(Collectors.toList())));
   }
 
   @Override