Fix tests.

Author: jimmygchen

beacon_node/lighthouse_network/src/discovery/enr.rs

@@ -5,7 +5,6 @@ pub use discv5::enr::CombinedKey;
 use super::enr_ext::CombinedKeyExt;
 use super::enr_ext::{EnrExt, QUIC6_ENR_KEY, QUIC_ENR_KEY};
 use super::ENR_FILENAME;
-use crate::config::Config;
 use crate::types::{Enr, EnrAttestationBitfield, EnrSyncCommitteeBitfield};
 use crate::NetworkConfig;
 use alloy_rlp::bytes::Bytes;

beacon_node/lighthouse_network/src/rpc/codec.rs

@@ -1135,7 +1135,7 @@ mod tests {
         let mut dst = BytesMut::new();
 
         // Add context bytes if required
-        dst.extend_from_slice(&fork_context.to_context_bytes(fork_name).unwrap());
+        dst.extend_from_slice(&fork_context.context_bytes(fork_context.digest_epoch()));
 
         let mut uvi_codec: Uvi<usize> = Uvi::default();
 
@@ -1792,8 +1792,8 @@ mod tests {
         .unwrap();
 
         let mut wrong_fork_bytes = BytesMut::new();
-        wrong_fork_bytes
-            .extend_from_slice(&fork_context.to_context_bytes(ForkName::Altair).unwrap());
+        let altair_epoch = chain_spec.altair_fork_epoch.unwrap();
+        wrong_fork_bytes.extend_from_slice(&fork_context.context_bytes(altair_epoch));
         wrong_fork_bytes.extend_from_slice(&encoded_bytes.split_off(4));
 
         assert!(matches!(
@@ -1817,7 +1817,9 @@ mod tests {
         .unwrap();
 
         let mut wrong_fork_bytes = BytesMut::new();
-        wrong_fork_bytes.extend_from_slice(&fork_context.to_context_bytes(ForkName::Base).unwrap());
+        wrong_fork_bytes.extend_from_slice(
+            &fork_context.context_bytes(chain_spec.genesis_slot.epoch(Spec::slots_per_epoch())),
+        );
         wrong_fork_bytes.extend_from_slice(&encoded_bytes.split_off(4));
 
         assert!(matches!(
@@ -1833,7 +1835,7 @@ mod tests {
 
         // Adding context bytes to Protocols that don't require it should return an error
         let mut encoded_bytes = BytesMut::new();
-        encoded_bytes.extend_from_slice(&fork_context.to_context_bytes(ForkName::Altair).unwrap());
+        encoded_bytes.extend_from_slice(&fork_context.context_bytes(altair_epoch));
         encoded_bytes.extend_from_slice(
             &encode_response(
                 SupportedProtocol::MetaDataV2,
@@ -2034,7 +2036,8 @@ mod tests {
         let mut dst = BytesMut::with_capacity(1024);
 
         // Insert context bytes
-        dst.extend_from_slice(&fork_context.to_context_bytes(ForkName::Altair).unwrap());
+        let altair_epoch = fork_context.spec.altair_fork_epoch.unwrap();
+        dst.extend_from_slice(&fork_context.context_bytes(altair_epoch));
 
         // Insert length-prefix
         uvi_codec

beacon_node/network/src/service/tests.rs

@@ -11,7 +11,7 @@ use lighthouse_network::{Enr, GossipTopic};
 use std::str::FromStr;
 use std::sync::Arc;
 use tokio::runtime::Runtime;
-use types::{Epoch, EthSpec, ForkName, MinimalEthSpec, SubnetId};
+use types::{Epoch, EthSpec, MinimalEthSpec, SubnetId};
 
 impl<T: BeaconChainTypes> NetworkService<T> {
     fn get_topic_params(&self, topic: GossipTopic) -> Option<&gossipsub::TopicScoreParams> {
@@ -106,8 +106,8 @@ fn test_removing_topic_weight_on_old_topics() {
         .mock_execution_layer()
         .build()
         .chain;
-    let (next_fork_name, _) = beacon_chain.duration_to_next_fork().expect("next fork");
-    assert_eq!(next_fork_name, ForkName::Capella);
+    let (next_fork_epoch, _) = beacon_chain.duration_to_next_digest().expect("next fork");
+    assert_eq!(Some(next_fork_epoch), spec.capella_fork_epoch);
 
     // Build network service.
     let (mut network_service, network_globals, _network_senders) = runtime.block_on(async {
@@ -189,9 +189,8 @@ fn test_removing_topic_weight_on_old_topics() {
         beacon_chain.slot_clock.advance_slot();
     }
 
-    // Run `NetworkService::update_next_fork()`.
     runtime.block_on(async {
-        network_service.update_next_fork();
+        network_service.update_next_fork_digest();
     });
 
     // Check that topic_weight on the old topics has been zeroed.

consensus/types/src/enr_fork_id.rs

@@ -1,5 +1,5 @@
 use crate::test_utils::TestRandom;
-use crate::{ChainSpec, Epoch};
+use crate::Epoch;
 
 use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};