Resolve merge conflicts

testing/ef_tests/src/cases/fork_choice.rs

@@ -920,7 +920,7 @@ impl<E: EthSpec> Tester<E> {
         let cached_head = self.harness.chain.canonical_head.cached_head();
         let next_slot = cached_head.snapshot.beacon_block.slot() + 1;
         let next_slot_epoch = next_slot.epoch(E::slots_per_epoch());
-        let (proposer_indices, decision_root, _, fork) =
+        let (proposer_indices, decision_root, _, _, fork) =
             compute_proposer_duties_from_head(next_slot_epoch, &self.harness.chain).unwrap();
         let proposer_index = proposer_indices[next_slot.as_usize() % E::slots_per_epoch() as usize];
 

testing/ef_tests/src/cases/rewards.rs

@@ -1,7 +1,7 @@
 use super::*;
 use crate::case_result::compare_result_detailed;
 use crate::decode::{ssz_decode_file, ssz_decode_state, yaml_decode_file};
-use compare_fields_derive::CompareFields;
+use compare_fields::CompareFields;
 use serde::Deserialize;
 use ssz::four_byte_option_impl;
 use ssz_derive::{Decode, Encode};

testing/ef_tests/src/cases/ssz_generic.rs

@@ -318,14 +318,13 @@ where
 {
     let s: String = serde::de::Deserialize::deserialize(deserializer)?;
     let decoded: Vec<u8> = hex::decode(&s.as_str()[2..]).map_err(D::Error::custom)?;
+    let decoded_len = decoded.len();
 
-    if decoded.len() > N::to_usize() {
-        Err(D::Error::custom(format!(
+    decoded.try_into().map_err(|_| {
+        D::Error::custom(format!(
             "Too many values for list, got: {}, limit: {}",
-            decoded.len(),
+            decoded_len,
             N::to_usize()
-        )))
-    } else {
-        Ok(decoded.into())
-    }
+        ))
+    })
 }

testing/ef_tests/src/handler.rs

@@ -1083,8 +1083,7 @@ impl<E: EthSpec + TypeName> Handler for LightClientUpdateHandler<E> {
 
     fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool {
         // Enabled in Altair
-        // No test in Fulu yet.
-        fork_name.altair_enabled() && fork_name != ForkName::Fulu
+        fork_name.altair_enabled()
     }
 }