cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Ef test version update (#4142)

Browse Source 
* Revert "revert change to ef_tests"

This reverts commit 1093ba1a27.

* Revert "Revert "Use consensus-spec-tests `v1.3.0-rc.3` (#4021)""

This reverts commit 20be7024e1.

* update tests
This commit is contained in:
realbigsean 2023-03-28 11:47:30 -04:00 committed by GitHub
parent f580863337
commit da7fab5188
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/ef_tests/Makefile
View File

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

5
testing/ef_tests/check_all_files_accessed.py
View File

@ -57,9 +57,11 @@ excluded_paths = [
"tests/general/deneb/kzg"
]
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():
@ -92,4 +94,5 @@ for root, dirs, files in os.walk(tests_dir_filename):
# 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
testing/ef_tests/src/cases/merkle_proof_validity.rs
View File

@ -28,11 +28,6 @@ pub struct MerkleProofValidity<E: EthSpec> {
impl<E: EthSpec> LoadCase for MerkleProofValidity<E> {
fn load_from_dir(path: &Path, fork_name: ForkName) -> Result<Self, Error> {
//FIXME(sean)
if path.ends_with("execution_merkle_proof") {
return Err(Error::SkippedKnownFailure);
}
let spec = &testing_spec::<E>(fork_name);
let state = ssz_decode_state(&path.join("object.ssz_snappy"), spec)?;
let merkle_proof = yaml_decode_file(&path.join("proof.yaml"))?;

19
testing/ef_tests/src/handler.rs
View File

@ -1,6 +1,6 @@
use crate::cases::{self, Case, Cases, EpochTransition, LoadCase, Operation};
use crate::type_name;
use crate::type_name::TypeName;
use crate::{type_name, Error};
use derivative::Derivative;
use std::fs::{self, DirEntry};
use std::marker::PhantomData;
@ -57,17 +57,11 @@ pub trait Handler {
.filter_map(as_directory)
.flat_map(|suite| fs::read_dir(suite.path()).expect("suite dir exists"))
.filter_map(as_directory)
.filter_map(|test_case_dir| {
.map(|test_case_dir| {
let path = test_case_dir.path();
let case_result = Self::Case::load_from_dir(&path, fork_name);
if let Err(Error::SkippedKnownFailure) = case_result.as_ref() {
return None;
}
let case = case_result.expect("test should load");
Some((path, case))
let case = Self::Case::load_from_dir(&path, fork_name).expect("test should load");
(path, case)
})
.collect();
@ -664,6 +658,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 && fork_name != ForkName::Deneb
}
}