From ca9d9fa11ccba611c60c71c9a44973ab3d926b82 Mon Sep 17 00:00:00 2001 From: Paul Harris Date: Mon, 11 Dec 2023 13:24:52 +1000 Subject: [PATCH] updated to 1.4.0-beta.5 refrests (#7811) Signed-off-by: Paul Harris --- build.gradle | 2 +- .../deneb/merkle_proof/SingleMerkleProofTestExecutor.java | 8 ++++---- .../phase0/forkchoice/ForkChoiceTestExecutor.java | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index f37201c5082..327b3f48f1c 100644 --- 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/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/deneb/merkle_proof/SingleMerkleProofTestExecutor.java b/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/deneb/merkle_proof/SingleMerkleProofTestExecutor.java index dc6b50891bc..82671409527 100644 --- a/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/deneb/merkle_proof/SingleMerkleProofTestExecutor.java +++ b/eth-reference-tests/src/referenceTest/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/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/phase0/forkchoice/ForkChoiceTestExecutor.java b/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/phase0/forkchoice/ForkChoiceTestExecutor.java index 0cb6d39269a..b93d70ea566 100644 --- a/eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/phase0/forkchoice/ForkChoiceTestExecutor.java +++ b/eth-reference-tests/src/referenceTest/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();