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
This commit is contained in:
Paul Hauner 2023-02-28 02:20:51 +00:00
parent cc4fc422b2
commit caa6190d4a
3 changed files with 12 additions and 4 deletions

View File

@ -1,4 +1,4 @@
TESTS_TAG := v1.3.0-rc.1 TESTS_TAG := v1.3.0-rc.3
TESTS = general minimal mainnet TESTS = general minimal mainnet
TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS)) TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS))

View File

@ -41,8 +41,8 @@ excluded_paths = [
"tests/.*/.*/ssz_static/LightClientFinalityUpdate", "tests/.*/.*/ssz_static/LightClientFinalityUpdate",
# LightClientHeader # LightClientHeader
"tests/.*/.*/ssz_static/LightClientHeader", "tests/.*/.*/ssz_static/LightClientHeader",
# Eip4844 tests are disabled for now. # Deneb (previously known as eip4844) tests are disabled for now.
"tests/.*/eip4844", "tests/.*/deneb",
# One of the EF researchers likes to pack the tarballs on a Mac # One of the EF researchers likes to pack the tarballs on a Mac
".*\.DS_Store.*", ".*\.DS_Store.*",
# More Mac weirdness. # More Mac weirdness.
@ -55,9 +55,11 @@ excluded_paths = [
"bls12-381-tests/hash_to_G2" "bls12-381-tests/hash_to_G2"
] ]
def normalize_path(path): def normalize_path(path):
return path.split("consensus-spec-tests/")[1] return path.split("consensus-spec-tests/")[1]
# Determine the list of filenames which were accessed during tests. # Determine the list of filenames which were accessed during tests.
passed = set() passed = set()
for line in open(accessed_files_filename, 'r').readlines(): for line in open(accessed_files_filename, 'r').readlines():
@ -90,4 +92,5 @@ for root, dirs, files in os.walk(tests_dir_filename):
# Exit with an error if there were any files missed. # Exit with an error if there were any files missed.
assert len(missed) == 0, "{} missed files".format(len(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))

View File

@ -650,6 +650,11 @@ impl<E: EthSpec + TypeName> Handler for MerkleProofValidityHandler<E> {
fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool { fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool {
fork_name != ForkName::Base 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
} }
} }