Fix tests

Author: eserilev

beacon_node/http_api/tests/interactive_tests.rs

@@ -1057,7 +1057,14 @@ async fn proposer_duties_with_gossip_tolerance() {
 // have been updated with the correct values.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn lighthouse_restart_custody_backfill() {
-    let spec = test_spec::<E>();
+    let mut spec = test_spec::<E>();
+
+    spec.altair_fork_epoch = Some(Epoch::new(0));
+    spec.bellatrix_fork_epoch = Some(Epoch::new(0));
+    spec.capella_fork_epoch = Some(Epoch::new(0));
+    spec.deneb_fork_epoch = Some(Epoch::new(0));
+    spec.electra_fork_epoch = Some(Epoch::new(0));
+    spec.fulu_fork_epoch = Some(Epoch::new(0));
 
     let validator_count = 24;
 
@@ -1120,6 +1127,13 @@ async fn lighthouse_custody_info() {
     spec.min_epochs_for_blob_sidecars_requests = 2;
     spec.min_epochs_for_data_column_sidecars_requests = 2;
 
+    spec.altair_fork_epoch = Some(Epoch::new(0));
+    spec.bellatrix_fork_epoch = Some(Epoch::new(0));
+    spec.capella_fork_epoch = Some(Epoch::new(0));
+    spec.deneb_fork_epoch = Some(Epoch::new(0));
+    spec.electra_fork_epoch = Some(Epoch::new(0));
+    spec.fulu_fork_epoch = Some(Epoch::new(0));
+
     let validator_count = 24;
 
     let tester = InteractiveTester::<E>::new(Some(spec), validator_count).await;

common/eth2/src/types.rs

@@ -1560,20 +1560,15 @@ pub struct ForkChoiceNode {
     pub execution_block_hash: Option<Hash256>,
 }
 
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Copy, Clone, Default, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub enum BroadcastValidation {
+    #[default]
     Gossip,
     Consensus,
     ConsensusAndEquivocation,
 }
 
-impl Default for BroadcastValidation {
-    fn default() -> Self {
-        Self::Gossip
-    }
-}
-
 impl Display for BroadcastValidation {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {

validator_client/initialized_validators/src/key_cache.rs

@@ -291,7 +291,7 @@ mod tests {
     #[tokio::test]
     async fn test_encryption() {
         let mut key_cache = KeyCache::new();
-        let keypairs = vec![Keypair::random(), Keypair::random()];
+        let keypairs = [Keypair::random(), Keypair::random()];
         let uuids = vec![Uuid::from_u128(1), Uuid::from_u128(2)];
         let passwords = vec![
             PlainText::from(vec![1, 2, 3, 4, 5, 6]),