Fixes after rebasing Kintsugi onto unstable (#2799)

* Fix fork choice after rebase

* Remove paulhauner warp dep

* Fix fork choice test compile errors

* Assume fork choice payloads are valid

* Add comment

* Ignore new tests

* Fix error in test skipping

testing/ef_tests/Cargo.toml

@@ -34,3 +34,4 @@ snap = "1.0.1"
 fs2 = "0.4.3"
 beacon_chain = { path = "../../beacon_node/beacon_chain" }
 store = { path = "../../beacon_node/store" }
+fork_choice = { path = "../../consensus/fork_choice" }

testing/ef_tests/check_all_files_accessed.py

@@ -32,9 +32,16 @@ excluded_paths = [
     # LightClientSnapshot
     "tests/minimal/altair/ssz_static/LightClientSnapshot",
     "tests/mainnet/altair/ssz_static/LightClientSnapshot",
+    "tests/minimal/merge/ssz_static/LightClientSnapshot",
+    "tests/mainnet/merge/ssz_static/LightClientSnapshot",
     # Merkle-proof tests for light clients
-    "tests/mainnet/altair/merkle/single_proof/pyspec_tests/",
-    "tests/minimal/altair/merkle/single_proof/pyspec_tests/"
+    "tests/mainnet/altair/merkle/single_proof",
+    "tests/minimal/altair/merkle/single_proof",
+    "tests/mainnet/merge/merkle/single_proof",
+    "tests/minimal/merge/merkle/single_proof",
+    # Fork choice tests featuring PoW blocks
+    "tests/minimal/merge/fork_choice/on_merge_block/",
+    "tests/mainnet/merge/fork_choice/on_merge_block/"
 ]
 
 def normalize_path(path):

testing/ef_tests/src/cases.rs

@@ -26,6 +26,7 @@ mod ssz_generic;
 mod ssz_static;
 mod transition;
 
+pub use self::fork_choice::*;
 pub use bls_aggregate_sigs::*;
 pub use bls_aggregate_verify::*;
 pub use bls_eth_aggregate_pubkeys::*;
@@ -36,7 +37,6 @@ pub use bls_verify_msg::*;
 pub use common::SszStaticType;
 pub use epoch_processing::*;
 pub use fork::ForkTest;
-pub use fork_choice::*;
 pub use genesis_initialization::*;
 pub use genesis_validity::*;
 pub use operations::*;

testing/ef_tests/src/cases/fork_choice.rs

@@ -1,5 +1,6 @@
 use super::*;
 use crate::decode::{ssz_decode_file, ssz_decode_file_with, ssz_decode_state, yaml_decode_file};
+use ::fork_choice::PayloadVerificationStatus;
 use beacon_chain::{
     attestation_verification::{
         obtain_indexed_attestation_and_committees_per_slot, VerifiedAttestation,
@@ -218,6 +219,8 @@ impl<E: EthSpec> Tester<E> {
             .spec(spec.clone())
             .keypairs(vec![])
             .genesis_state_ephemeral_store(case.anchor_state.clone())
+            .mock_execution_layer()
+            .mock_execution_layer_all_payloads_valid()
             .build();
 
         if harness.chain.genesis_block_root != case.anchor_block.canonical_root() {
@@ -283,10 +286,11 @@ impl<E: EthSpec> Tester<E> {
         let block_root = block.canonical_root();
         if result.is_ok() != valid {
             return Err(Error::DidntFail(format!(
-                "block with root {} was valid={} whilst test expects valid={}",
+                "block with root {} was valid={} whilst test expects valid={}. result: {:?}",
                 block_root,
                 result.is_ok(),
-                valid
+                valid,
+                result
             )));
         }
 
@@ -319,6 +323,7 @@ impl<E: EthSpec> Tester<E> {
                     &block,
                     block_root,
                     &state,
+                    PayloadVerificationStatus::Irrelevant,
                     &self.harness.chain.spec,
                 );