Merge remote-tracking branch 'origin/unstable' into tree-states

testing/ef_tests/Makefile

@@ -1,4 +1,4 @@
-TESTS_TAG := v1.4.0-beta.4
+TESTS_TAG := v1.4.0-beta.6
 TESTS = general minimal mainnet
 TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS))
 

testing/ef_tests/check_all_files_accessed.py

@@ -51,7 +51,8 @@ excluded_paths = [
     "bls12-381-tests/deserialization_G1",
     "bls12-381-tests/deserialization_G2",
     "bls12-381-tests/hash_to_G2",
-    "tests/.*/eip6110"
+    "tests/.*/eip6110",
+    "tests/.*/whisk"
 ]
 
 

testing/ef_tests/tests/tests.rs

@@ -1,6 +1,6 @@
 #![cfg(feature = "ef_tests")]
 
-use ef_tests::{KzgInclusionMerkleProofValidityHandler, *};
+use ef_tests::*;
 use types::{MainnetEthSpec, MinimalEthSpec, *};
 
 // Check that the hand-computed multiplications on EthSpec are correctly computed.
@@ -605,6 +605,7 @@ fn merkle_proof_validity() {
 }
 
 #[test]
+#[cfg(feature = "fake_crypto")]
 fn kzg_inclusion_merkle_proof_validity() {
     KzgInclusionMerkleProofValidityHandler::<MainnetEthSpec>::default().run();
     KzgInclusionMerkleProofValidityHandler::<MinimalEthSpec>::default().run();