From caa6190d4a468ef74d647f668ac04e4accf293d5 Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Tue, 28 Feb 2023 02:20:51 +0000
Subject: [PATCH] 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
---
 testing/ef_tests/Makefile                    | 2 +-
 testing/ef_tests/check_all_files_accessed.py | 9 ++++++---
 testing/ef_tests/src/handler.rs              | 5 +++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/testing/ef_tests/Makefile b/testing/ef_tests/Makefile
index 1feba41c8..fc3dea6e2 100644
--- a/testing/ef_tests/Makefile
+++ b/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))
 
diff --git a/testing/ef_tests/check_all_files_accessed.py b/testing/ef_tests/check_all_files_accessed.py
index f8ddc0a9f..b52d15522 100755
--- a/testing/ef_tests/check_all_files_accessed.py
+++ b/testing/ef_tests/check_all_files_accessed.py
@@ -41,8 +41,8 @@ excluded_paths = [
     "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.
@@ -55,9 +55,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():
@@ -90,4 +92,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))
diff --git a/testing/ef_tests/src/handler.rs b/testing/ef_tests/src/handler.rs
index 07db7cd2a..c066bdafa 100644
--- a/testing/ef_tests/src/handler.rs
+++ b/testing/ef_tests/src/handler.rs
@@ -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
     }
 }