Skip to content

Commit caa6190

Browse files
committed
Use consensus-spec-tests v1.3.0-rc.3 (#4021)
## Issue Addressed NA ## Proposed Changes Updates our `ef_tests` to use: https://github.com/ethereum/consensus-specs/releases/tag/v1.3.0-rc.3 This required: - Skipping a `merkle_proof_validity` test (see #4022) - Account for the `eip4844` tests changing name to `deneb` - My IDE did some Python linting during this change. It seemed simple and nice so I left it there. ## Additional Info NA
1 parent cc4fc42 commit caa6190

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

testing/ef_tests/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TESTS_TAG := v1.3.0-rc.1
1+
TESTS_TAG := v1.3.0-rc.3
22
TESTS = general minimal mainnet
33
TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS))
44

testing/ef_tests/check_all_files_accessed.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"tests/.*/.*/ssz_static/LightClientFinalityUpdate",
4242
# LightClientHeader
4343
"tests/.*/.*/ssz_static/LightClientHeader",
44-
# Eip4844 tests are disabled for now.
45-
"tests/.*/eip4844",
44+
# Deneb (previously known as eip4844) tests are disabled for now.
45+
"tests/.*/deneb",
4646
# One of the EF researchers likes to pack the tarballs on a Mac
4747
".*\.DS_Store.*",
4848
# More Mac weirdness.
@@ -55,9 +55,11 @@
5555
"bls12-381-tests/hash_to_G2"
5656
]
5757

58+
5859
def normalize_path(path):
5960
return path.split("consensus-spec-tests/")[1]
6061

62+
6163
# Determine the list of filenames which were accessed during tests.
6264
passed = set()
6365
for line in open(accessed_files_filename, 'r').readlines():
@@ -90,4 +92,5 @@ def normalize_path(path):
9092
# Exit with an error if there were any files missed.
9193
assert len(missed) == 0, "{} missed files".format(len(missed))
9294

93-
print("Accessed {} files ({} intentionally excluded)".format(accessed_files, excluded_files))
95+
print("Accessed {} files ({} intentionally excluded)".format(
96+
accessed_files, excluded_files))

testing/ef_tests/src/handler.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,11 @@ impl<E: EthSpec + TypeName> Handler for MerkleProofValidityHandler<E> {
650650

651651
fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool {
652652
fork_name != ForkName::Base
653+
// Test is skipped due to some changes in the Capella light client
654+
// spec.
655+
//
656+
// https://github.com/sigp/lighthouse/issues/4022
657+
&& fork_name != ForkName::Capella
653658
}
654659
}
655660

0 commit comments

Comments
 (0)