fix tests

Consensys · Oct 30, 2024 · 33d7314 · 33d7314
1 parent c334670
commit 33d7314
Show file tree

Hide file tree

Showing 7 changed files with 126 additions and 125 deletions.
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
@@ -54,7 +54,7 @@ public void shouldSignBlock() {
     final BLSSignature expectedSignature =
         BLSSignature.fromBytesCompressed(
             Bytes.fromBase64String(
-                "pbSSuf7h70JkzI/U157flTWPZDuaBXgRLj1HLMoCwjA4Xd0hMdGewn7G2HLZiQcNC9G6FSd1+0BT5PwknYez4ya6TccwpaGnsvWYLPf3SNIX5Ug7Yi1CF1fvEr3x9sZ0"));
+                "owmSdVC0ohD8KseJ5xXVI8MrX+sJkrWJf7OMBbAJm4cugs0idsnksufjWdPmmtPDCgklh+oxhXxvNB32NkWMgS1WKBtC0/Ia4POxdURWx3klGx6w3og+yQGlPG/rJw2x"));
 
     final SafeFuture<BLSSignature> result = signer.signBlock(block, fork);
     asyncRunner.executeQueuedActions();
@@ -73,7 +73,7 @@ public void shouldSignBlindedBlock() {
     final BLSSignature expectedSignature =
         BLSSignature.fromBytesCompressed(
             Bytes.fromBase64String(
-                "pbSSuf7h70JkzI/U157flTWPZDuaBXgRLj1HLMoCwjA4Xd0hMdGewn7G2HLZiQcNC9G6FSd1+0BT5PwknYez4ya6TccwpaGnsvWYLPf3SNIX5Ug7Yi1CF1fvEr3x9sZ0"));
+                "ly4cxcYQcaynv/9xraWIv7emeza+AFVLOJ0YFnxyqxSxP1nfjkxYS1tuf3x4Y9/qFdVGs6v1QE9/wDBd6DgMg7FhfyKARNTVbNDWlO3jf5pRxNUNiJXNUVs6L0evcIKV"));
 
     final SafeFuture<BLSSignature> result = signer.signBlock(block, fork);
     asyncRunner.executeQueuedActions();

diff --git a/.../src/test/java/tech/pegasys/teku/networking/eth2/gossip/AttestationGossipManagerTest.java b/.../src/test/java/tech/pegasys/teku/networking/eth2/gossip/AttestationGossipManagerTest.java
@@ -84,13 +84,14 @@ public void setup() {
   public void onNewAttestation_afterMatchingAssignment() {
     // Create a new DataStructureUtil so that generated attestations are not subject to change
     // when access to the global DataStructureUtil changes
-    DataStructureUtil dataStructureUtil = new DataStructureUtil(spec);
-    final Attestation attestation = dataStructureUtil.randomAttestation(3);
+    final DataStructureUtil dataStructureUtil = new DataStructureUtil(spec);
+    final UInt64 slot = UInt64.valueOf(3);
+    final Attestation attestation = dataStructureUtil.randomAttestation(slot);
     final Attestation attestation2 =
         spec.getGenesisSchemaDefinitions()
             .getAttestationSchema()
             .create(
-                dataStructureUtil.randomBitlist(),
+                dataStructureUtil.randomBitlist(slot),
                 dataStructureUtil.randomAttestationData(UInt64.valueOf(13)),
                 dataStructureUtil.randomSignature());
     final int subnetId = computeSubnetId(attestation);

diff --git a/...tworking/eth2/rpc/beaconchain/methods/BlobSidecarsByRangeListenerValidatingProxyTest.java b/...tworking/eth2/rpc/beaconchain/methods/BlobSidecarsByRangeListenerValidatingProxyTest.java
@@ -357,7 +357,7 @@ void firstBlobSidecarIndexInNextBlockIsNotZero() {
             dataStructureUtil.randomSignedBeaconBlock(1), 0);
     final BlobSidecar blobSidecar2_1 =
         dataStructureUtil.randomBlobSidecarWithValidInclusionProofForBlock(
-            dataStructureUtil.randomSignedBeaconBlock(2, blobSidecar1_0.getBlockRoot()), 1);
+            dataStructureUtil.randomSignedBeaconBlock(2, blobSidecar1_0.getBlockRoot(), true), 1);
 
     assertDoesNotThrow(() -> listenerWrapper.onResponse(blobSidecar1_0).join());
 

diff --git a/...ient/src/test/java/tech/pegasys/teku/validator/client/duties/BlockProductionDutyTest.java b/...ient/src/test/java/tech/pegasys/teku/validator/client/duties/BlockProductionDutyTest.java
@@ -432,8 +432,8 @@ public void denebBlockSummary() {
     final BeaconBlockBody block = dataStructureUtil.randomBeaconBlockBody(denebSlot);
     assertThat(duty.getBlockSummary(block))
         .containsExactly(
-            "Blobs: 1",
-            "4483248126065046120 (0%) gas, EL block: b736203ee72088edaf7eb5c7839744f5b1be69f748eea8fea77740914415c5b4 (4479943159631677864)");
+            "Blobs: 5",
+            "4491510546443434056 (0%) gas, EL block: 58913d3ec8a62b95e52fb1ee60ebddf392af6e1db902dd5bc3f1eea7003130ff (4488205580010065800)");
   }
 
   @Test

diff --git a/...resources/tech/pegasys/teku/validator/client/signer/altairBlockExternalSignerMessage.json b/...resources/tech/pegasys/teku/validator/client/signer/altairBlockExternalSignerMessage.json
diff --git a/...ources/tech/pegasys/teku/validator/client/signer/bellatrixBlockExternalSignerMessage.json b/...ources/tech/pegasys/teku/validator/client/signer/bellatrixBlockExternalSignerMessage.json
@@ -1,13 +1,13 @@
 {
-  "signingRoot" : "0x97efca47543ccd4fac17f16aecdc0aa9c58493fdf116ea5deaeb5e5fc34a6369",
+  "signingRoot" : "0x3f9c1cc3af54c94ee8a677aee350bb772b00c3864b7dfdd34ffaf6ab004d1f0a",
   "type" : "BLOCK_V2",
   "fork_info" : {
     "fork" : {
-      "previous_version" : "0xc7dab83e",
-      "current_version" : "0x8e77ca3e",
-      "epoch" : "4522907744740301673"
+      "previous_version" : "0x003ea73e",
+      "current_version" : "0x135fa13e",
+      "epoch" : "4517950290795281992"
     },
-    "genesis_validators_root" : "0x003ea73e885578bda77a6ee17f4c6c88227980d9e6e5fe448bdc2f93a5614b3e"
+    "genesis_validators_root" : "0xed1cad3ee8099978b13707b6acc357bb1b768147301dd68a5d5beccacb0094b3"
   },
   "beacon_block" : {
     "version" : "BELLATRIX",
@@ -16,7 +16,7 @@
       "proposer_index" : "4665021361504678828",
       "parent_root" : "0xfd18cf40cc907a739be483f1ca0ee23ad65cdd3df23205eabc6d660a75d1f54e",
       "state_root" : "0x103ac9406cdc59b89027eb1c9e97f607dd5fdccfa8fb2da4eaeea9d25032add9",
-      "body_root" : "0xbae795425cddcee74a9be8edb9489e071ba5b436852e28f585e844d9514a9575"
+      "body_root" : "0xada3b1be6d79e8300c701822a4358a8e8d323c74cf16dbd998db63273f032b34"
     }
   }
 }