Merge remote-tracking branch 'upstream/unstable' into gloas-containers

testing/ef_tests/Makefile

@@ -1,6 +1,6 @@
 # To download/extract nightly tests, run:
 # CONSENSUS_SPECS_TEST_VERSION=nightly make
-CONSENSUS_SPECS_TEST_VERSION ?= v1.6.0-alpha.5
+CONSENSUS_SPECS_TEST_VERSION ?= v1.6.0-alpha.6
 REPO_NAME := consensus-spec-tests
 OUTPUT_DIR := ./$(REPO_NAME)
 

testing/ef_tests/check_all_files_accessed.py

@@ -59,6 +59,9 @@ excluded_paths = [
     "tests/.*/.*/epoch_processing/.*/post_epoch.ssz_snappy",
     # Ignore gloas tests for now
     "tests/.*/gloas/.*",
+    # Ignore KZG tests that target internal kzg library functions
+    "tests/.*/compute_verify_cell_kzg_proof_batch_challenge/.*",
+    "tests/.*/compute_challenge/.*",
 ]
 
 

testing/ef_tests/src/cases/fork.rs

@@ -60,7 +60,7 @@ impl<E: EthSpec> Case for ForkTest<E> {
     fn result(&self, _case_index: usize, fork_name: ForkName) -> Result<(), Error> {
         let mut result_state = self.pre.clone();
         let mut expected = Some(self.post.clone());
-        let spec = &E::default_spec();
+        let spec = &fork_name.make_genesis_spec(E::default_spec());
 
         let mut result = match fork_name {
             ForkName::Base => panic!("phase0 not supported"),