Clean up

Author: jimmygchen

beacon_node/beacon_chain/src/custody_context.rs

@@ -7,7 +7,6 @@ use std::{
     sync::atomic::{AtomicU64, Ordering},
 };
 use tracing::{debug, warn};
-use types::data_column_custody_group::{CustodyIndex, compute_columns_for_custody_group};
 use types::{ChainSpec, ColumnIndex, Epoch, EthSpec, Slot};
 
 /// A delay before making the CGC change effective to the data availability checker.
@@ -504,7 +503,7 @@ impl<E: EthSpec> CustodyContext<E> {
 
         // This is an unnecessary conversion for spec compliance, basically just multiplying by 1.
         let columns_per_custody_group = spec.data_columns_per_group::<E>() as usize;
-        let custody_column_count = columns_per_custody_group * (custody_group_count);
+        let custody_column_count = columns_per_custody_group * custody_group_count;
 
         &self.ordered_custody_column_indices[..custody_column_count]
     }

beacon_node/client/src/builder.rs

@@ -193,8 +193,10 @@ where
             Kzg::new_from_trusted_setup_no_precomp(&config.trusted_setup).map_err(kzg_err_msg)?
         };
 
-        let ordered_custody_column_indices = compute_ordered_custody_column_indices(node_id, &spec)
-            .map_err(|e| format!("Failed to compute ordered custody column indices: {:?}", e))?;
+        let ordered_custody_column_indices =
+            compute_ordered_custody_column_indices::<E>(node_id, &spec).map_err(|e| {
+                format!("Failed to compute ordered custody column indices: {:?}", e)
+            })?;
 
         let builder = BeaconChainBuilder::new(eth_spec_instance, Arc::new(kzg))
             .store(store)
@@ -215,12 +217,6 @@ where
                     .map_err(|e| format!("Failed to create RNG: {:?}", e))?,
             ));
 
-        // FIXME: remove
-        println!(
-            "ordered_custody_column_indices: {:?}",
-            ordered_custody_column_indices
-        );
-
         let builder = if let Some(slasher) = self.slasher.clone() {
             builder.slasher(slasher)
         } else {

beacon_node/src/lib.rs

@@ -122,9 +122,10 @@ impl<E: EthSpec> ProductionBeaconNode<E> {
             builder
         };
 
+        // Generate or load the node id.
         let local_keypair = load_private_key(&client_config.network);
-        // ASSERT same result
         let node_id = peer_id_to_node_id(&local_keypair.public().to_peer_id())?.raw();
+
         let builder = builder
             .beacon_chain_builder(client_genesis, client_config.clone(), node_id)
             .await?;
@@ -200,7 +201,6 @@ impl lighthouse_network::discv5::Executor for Discv5Executor {
 #[cfg(test)]
 mod test {
     use super::*;
-
     use types::MainnetEthSpec;
 
     #[test]

common/network_utils/src/enr_ext.rs

@@ -353,6 +353,7 @@ pub fn peer_id_to_node_id(peer_id: &PeerId) -> Result<discv5::enr::NodeId, Strin
 
 #[cfg(test)]
 mod tests {
+
     use super::*;
 
     #[test]