fix tests

StefanBratanov · Nov 7, 2023 · d7465b1 · d7465b1
1 parent 5a79b69
commit d7465b1
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/...ation-test/resources/tech/pegasys/teku/beaconrestapi/v3/newBlindedBlockContentsDENEB.json b/...ation-test/resources/tech/pegasys/teku/beaconrestapi/v3/newBlindedBlockContentsDENEB.json
diff --git a/.../integration-test/resources/tech/pegasys/teku/beaconrestapi/v3/newBlockContentsDENEB.json b/.../integration-test/resources/tech/pegasys/teku/beaconrestapi/v3/newBlockContentsDENEB.json
diff --git a/...m/spec/src/main/java/tech/pegasys/teku/spec/datastructures/builder/BlobsBundleSchema.java b/...m/spec/src/main/java/tech/pegasys/teku/spec/datastructures/builder/BlobsBundleSchema.java
@@ -19,9 +19,9 @@
 import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;
 import tech.pegasys.teku.spec.config.SpecConfigDeneb;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.Blob;
+import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobKzgCommitmentsSchema;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSchema;
 import tech.pegasys.teku.spec.datastructures.type.SszKZGCommitment;
-import tech.pegasys.teku.spec.datastructures.type.SszKZGCommitmentSchema;
 import tech.pegasys.teku.spec.datastructures.type.SszKZGProof;
 import tech.pegasys.teku.spec.datastructures.type.SszKZGProofSchema;
 
@@ -30,17 +30,19 @@ public class BlobsBundleSchema
         BlobsBundle, SszList<SszKZGCommitment>, SszList<SszKZGProof>, SszList<Blob>> {
 
   public BlobsBundleSchema(
-      final String containerName, final BlobSchema blobSchema, final SpecConfigDeneb specConfig) {
+      final String containerName,
+      final BlobSchema blobSchema,
+      final BlobKzgCommitmentsSchema blobKzgCommitmentsSchema,
+      final SpecConfigDeneb specConfig) {
     super(
         containerName,
+        namedSchema("commitments", blobKzgCommitmentsSchema),
         namedSchema(
-            "commitments",
+            "proofs",
             SszListSchema.create(
-                SszKZGCommitmentSchema.INSTANCE, specConfig.getMaxBlobsPerBlock())),
+                SszKZGProofSchema.INSTANCE, specConfig.getMaxBlobCommitmentsPerBlock())),
         namedSchema(
-            "proofs",
-            SszListSchema.create(SszKZGProofSchema.INSTANCE, specConfig.getMaxBlobsPerBlock())),
-        namedSchema("blobs", SszListSchema.create(blobSchema, specConfig.getMaxBlobsPerBlock())));
+            "blobs", SszListSchema.create(blobSchema, specConfig.getMaxBlobCommitmentsPerBlock())));
   }
 
   @SuppressWarnings("unchecked")

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsDeneb.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsDeneb.java
@@ -161,7 +161,8 @@ public SchemaDefinitionsDeneb(final SpecConfigDeneb specConfig) {
             signedBlindedBlobSidecarSchema,
             signedBlindedBeaconBlockSchema,
             "SignedBlindedBlockContentsDeneb");
-    this.blobsBundleSchema = new BlobsBundleSchema("BlobsBundleDeneb", blobSchema, specConfig);
+    this.blobsBundleSchema =
+        new BlobsBundleSchema("BlobsBundleDeneb", blobSchema, blobKzgCommitmentsSchema, specConfig);
     this.executionPayloadAndBlobsBundleSchema =
         new ExecutionPayloadAndBlobsBundleSchema(executionPayloadSchemaDeneb, blobsBundleSchema);
     this.blobSidecarsByRootRequestMessageSchema =

diff --git a/ethereum/spec/src/test/java/tech/pegasys/teku/spec/signatures/LocalSignerTest.java b/ethereum/spec/src/test/java/tech/pegasys/teku/spec/signatures/LocalSignerTest.java
@@ -101,7 +101,7 @@ public void shouldSignBlobSidecar() {
     final BLSSignature expectedSignature =
         BLSSignature.fromBytesCompressed(
             Bytes.fromBase64String(
-                "g2gwxuzLti3gnykvswX9BazzZjOJKDJPsPdKAueMe3Q18vKlQ6mr2P+z2XDZgHzZEFkCgGpAa6bbmB/NxSNywI8tJsy0ecrgFfX0uIK1CJpfnpboU8L4F3rqaVj/rGhh"));
+                "sIUsP7VzwCDgx0mx9QbaTwch3yt72w1uGqZWURUwlkRN51EwgXSiTbm7O8BKMbTOEiA9sKUjbNdy5uX145n+mDuxzPGMaejyb/ZdNqSbCjd6vXc67Y7PM/m8AcjSmIEs"));
 
     final SafeFuture<BLSSignature> result = signer.signBlobSidecar(blobSidecar, fork);
     asyncRunner.executeQueuedActions();
@@ -127,7 +127,7 @@ public void shouldSignBlindedBlobSidecar() {
     final BLSSignature expectedSignature =
         BLSSignature.fromBytesCompressed(
             Bytes.fromBase64String(
-                "g2gwxuzLti3gnykvswX9BazzZjOJKDJPsPdKAueMe3Q18vKlQ6mr2P+z2XDZgHzZEFkCgGpAa6bbmB/NxSNywI8tJsy0ecrgFfX0uIK1CJpfnpboU8L4F3rqaVj/rGhh"));
+                "sIUsP7VzwCDgx0mx9QbaTwch3yt72w1uGqZWURUwlkRN51EwgXSiTbm7O8BKMbTOEiA9sKUjbNdy5uX145n+mDuxzPGMaejyb/ZdNqSbCjd6vXc67Y7PM/m8AcjSmIEs"));
 
     final SafeFuture<BLSSignature> result = signer.signBlindedBlobSidecar(blindedBlobSidecar, fork);
     asyncRunner.executeQueuedActions();

diff --git a/ethereum/spec/src/testFixtures/java/tech/pegasys/teku/spec/util/DataStructureUtil.java b/ethereum/spec/src/testFixtures/java/tech/pegasys/teku/spec/util/DataStructureUtil.java
@@ -2531,8 +2531,7 @@ public SignedBlindedBlobSidecar buildSignedBlinded() {
   }
 
   public SszList<SszKZGCommitment> randomSszKzgCommitmentList() {
-    final int count = randomInt(spec.getMaxBlobCommitmentsPerBlock().orElseThrow()) + 1;
-    return randomSszKzgCommitmentList(count);
+    return randomSszKzgCommitmentList(randomNumberOfBlobCommitmentsPerBlock());
   }
 
   public SszList<SszKZGCommitment> randomSszKzgCommitmentList(final int count) {

diff --git a/...ration-test/resources/responses/produce_block_responses/newBlindedBlockContentsDENEB.json b/...ration-test/resources/responses/produce_block_responses/newBlindedBlockContentsDENEB.json
diff --git a/...c/integration-test/resources/responses/produce_block_responses/newBlockContentsDENEB.json b/...c/integration-test/resources/responses/produce_block_responses/newBlockContentsDENEB.json