updated to 1.4.0-beta.5 refrests (Consensys#7811)

Signed-off-by: Paul Harris <[email protected]>
sicw · Dec 11, 2023 · ca9d9fa · ca9d9fa
1 parent 9e06357
commit ca9d9fa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -295,7 +295,7 @@ allprojects {
   }
 }
 
-def refTestVersion = 'v1.4.0-beta.4' // Arbitrary change to refresh cache number: 1
+def refTestVersion = 'v1.4.0-beta.5' // Arbitrary change to refresh cache number: 1
 def blsRefTestVersion = 'v0.1.2'
 def refTestBaseUrl = 'https://github.com/ethereum/consensus-spec-tests/releases/download'
 def blsRefTestBaseUrl = 'https://github.com/ethereum/bls12-381-tests/releases/download'

diff --git a/...st/java/tech/pegasys/teku/reference/deneb/merkle_proof/SingleMerkleProofTestExecutor.java b/...st/java/tech/pegasys/teku/reference/deneb/merkle_proof/SingleMerkleProofTestExecutor.java
@@ -89,10 +89,10 @@ void runBeaconBlockBodyTest(
             OBJECT_SSZ_FILE,
             testDefinition.getSpec().getGenesisSchemaDefinitions().getBeaconBlockBodySchema());
 
-    switch (proofType) {
-      case "blob_kzg_commitment_merkle_proof" -> runBlobKzgCommitmentMerkleProofTest(
-          testDefinition, data, beaconBlockBody);
-      default -> throw new RuntimeException("Unknown proof type " + proofType);
+    if (proofType.startsWith("blob_kzg_commitment_merkle_proof")) {
+      runBlobKzgCommitmentMerkleProofTest(testDefinition, data, beaconBlockBody);
+    } else {
+      throw new RuntimeException("Unknown proof type " + proofType);
     }
   }
 

diff --git a/...erenceTest/java/tech/pegasys/teku/reference/phase0/forkchoice/ForkChoiceTestExecutor.java b/...erenceTest/java/tech/pegasys/teku/reference/phase0/forkchoice/ForkChoiceTestExecutor.java
@@ -92,9 +92,7 @@ public class ForkChoiceTestExecutor implements TestExecutor {
           .put("fork_choice/on_merge_block", new ForkChoiceTestExecutor())
           .put("fork_choice/withholding", new ForkChoiceTestExecutor())
           .put("sync/optimistic", new ForkChoiceTestExecutor())
-          // TODO: following tests are related to late block reorgs.
-          //  Must be re-enabled once implementation #6595 is done
-          .put("fork_choice/should_override_forkchoice_update", IGNORE_TESTS)
+          .put("fork_choice/should_override_forkchoice_update", new ForkChoiceTestExecutor())
           .put("fork_choice/get_proposer_head", new ForkChoiceTestExecutor("basic_is_parent_root"))
           .build();