improve retrieval of blobs and proofs from reference test

StefanBratanov · Oct 20, 2023 · bbb84f7 · bbb84f7
1 parent 90281dd
commit bbb84f7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/...erenceTest/java/tech/pegasys/teku/reference/phase0/forkchoice/ForkChoiceTestExecutor.java b/...erenceTest/java/tech/pegasys/teku/reference/phase0/forkchoice/ForkChoiceTestExecutor.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -309,27 +310,28 @@ private void applyBlock(
     final SignedBeaconBlock block =
         TestDataUtils.loadSsz(
             testDefinition, blockName + SSZ_SNAPPY_EXTENSION, spec::deserializeSignedBeaconBlock);
-    getOptionally(step, "blobs")
-        .ifPresent(
-            blobsName -> {
-              final List<Blob> blobs =
-                  TestDataUtils.loadSsz(
-                          testDefinition,
-                          blobsName + SSZ_SNAPPY_EXTENSION,
-                          sszBytes -> spec.deserializeBlobsInBlock(sszBytes, block.getSlot()))
-                      .asList();
-              @SuppressWarnings("unchecked")
-              final List<KZGProof> proofs =
-                  ((List<String>) get(step, "proofs"))
-                      .stream().map(KZGProof::fromHexString).toList();
-              LOG.info(
-                  "Preparing {} blobs with proofs {} for block {}",
-                  blobs.size(),
-                  proofs,
-                  block.getRoot());
-              blobSidecarManager.prepareBlobsAndProofsForBlock(block, blobs, proofs);
-            });
-
+    final List<Blob> blobs =
+        getOptionally(step, "blobs")
+            .map(
+                blobsName ->
+                    TestDataUtils.loadSsz(
+                            testDefinition,
+                            blobsName + SSZ_SNAPPY_EXTENSION,
+                            sszBytes -> spec.deserializeBlobsInBlock(sszBytes, block.getSlot()))
+                        .asList())
+            .orElse(Collections.emptyList());
+    @SuppressWarnings("unchecked")
+    final List<KZGProof> proofs =
+        getOptionally(step, "proofs")
+            .map(
+                proofsArray ->
+                    ((List<String>) proofsArray).stream().map(KZGProof::fromHexString).toList())
+            .orElse(Collections.emptyList());
+    if (block.getMessage().getBody().toVersionDeneb().isPresent()) {
+      LOG.info(
+          "Preparing {} blobs with proofs {} for block {}", blobs.size(), proofs, block.getRoot());
+      blobSidecarManager.prepareBlobsAndProofsForBlock(block, blobs, proofs);
+    }
     LOG.info(
         "Importing block {} at slot {} with parent {}",
         block.getRoot(),

diff --git a/...erenceTest/java/tech/pegasys/teku/reference/phase0/forkchoice/StubBlobSidecarManager.java b/...erenceTest/java/tech/pegasys/teku/reference/phase0/forkchoice/StubBlobSidecarManager.java
@@ -48,7 +48,7 @@ class StubBlobSidecarManager implements BlobSidecarManager {
     this.spec = spec;
   }
 
-  /** Manually provide blobs and proofs for a block * */
+  /** Prepare the blobs and proofs for a block provided by the reference test * */
   public void prepareBlobsAndProofsForBlock(
       final SignedBeaconBlock block, final List<Blob> blobs, final List<KZGProof> proofs) {
     blobsAndProofsByBlockRoot.put(block.getRoot(), new BlobsAndProofs(blobs, proofs));
@@ -80,8 +80,8 @@ public boolean isAvailabilityRequiredAtSlot(final UInt64 slot) {
 
   /**
    * Creates an implementation of {@link BlobSidecarsAvailabilityChecker} which uses the simplified
-   * {@link MiscHelpers#isDataAvailable(List, List, List)} method with the already provided blobs
-   * and proofs by the reference test
+   * {@link MiscHelpers#isDataAvailable(List, List, List)} method with the blobs and proofs that the
+   * reference test has provided
    */
   @Override
   public BlobSidecarsAvailabilityChecker createAvailabilityChecker(final SignedBeaconBlock block) {
@@ -93,7 +93,7 @@ public boolean initiateDataAvailabilityCheck() {
 
       @Override
       public SafeFuture<BlobSidecarsAndValidationResult> getAvailabilityCheckResult() {
-        final BlobsAndProofs blobsAndProofs = blobsAndProofsByBlockRoot.get(block.getRoot());
+        final BlobsAndProofs blobsAndProofs = blobsAndProofsByBlockRoot.remove(block.getRoot());
         if (blobsAndProofs == null) {
           return SafeFuture.completedFuture(BlobSidecarsAndValidationResult.NOT_REQUIRED);
         }