Merge branch 'unstable' into off-4844

testing/ef_tests/Makefile

@@ -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))
 

testing/ef_tests/check_all_files_accessed.py

@@ -53,9 +53,11 @@ excluded_paths = [
     "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():
@@ -88,4 +90,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))

testing/ef_tests/src/handler.rs

@@ -653,6 +653,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
     }
 }