Skip to content

Commit

Permalink
Use consensus-spec-tests v1.3.0-rc.3 (#4021)
Browse files Browse the repository at this point in the history
## 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
  • Loading branch information
paulhauner committed Feb 28, 2023
1 parent deecbe7 commit 0a7e651
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion testing/ef_tests/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TESTS_TAG := v1.3.0-rc.1
TESTS_TAG := v1.3.0-rc.3
TESTS = general minimal mainnet
TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS))

Expand Down
9 changes: 6 additions & 3 deletions testing/ef_tests/check_all_files_accessed.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"tests/.*/.*/ssz_static/LightClientFinalityUpdate",
# LightClientHeader
"tests/.*/.*/ssz_static/LightClientHeader",
# Eip4844 tests are disabled for now.
"tests/.*/eip4844",
# Deneb (previously known as eip4844) tests are disabled for now.
"tests/.*/deneb",
# One of the EF researchers likes to pack the tarballs on a Mac
".*\.DS_Store.*",
# More Mac weirdness.
Expand All @@ -55,9 +55,11 @@
"bls12-381-tests/hash_to_G2"
]


def normalize_path(path):
return path.split("consensus-spec-tests/")[1]


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

print("Accessed {} files ({} intentionally excluded)".format(accessed_files, excluded_files))
print("Accessed {} files ({} intentionally excluded)".format(
accessed_files, excluded_files))
5 changes: 5 additions & 0 deletions testing/ef_tests/src/handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,11 @@ impl<E: EthSpec + TypeName> Handler for MerkleProofValidityHandler<E> {

fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool {
fork_name != ForkName::Base
// Test is skipped due to some changes in the Capella light client
// spec.
//
// https://github.com/sigp/lighthouse/issues/4022
&& fork_name != ForkName::Capella
}
}

Expand Down

0 comments on commit 0a7e651

Please sign in to comment.