Fix comments from Michael

beacon_node/client/src/lib.rs

@@ -68,10 +68,6 @@ where
     pub websocket_exit_signal: Option<Signal>,
     /// The clients logger.
     log: slog::Logger,
-    /*
-    /// Marker to pin the beacon chain generics.
-    phantom: PhantomData<BeaconChainTypes>,
-    */
 }
 
 impl<S, E> Client<S, E>

beacon_node/eth2-libp2p/src/service.rs

@@ -49,7 +49,6 @@ impl Service {
         };
 
         // load the private key from CLI flag, disk or generate a new one
-        // let local_private_key = load_private_key(&config, &log);
         let local_peer_id = PeerId::from(local_keypair.public());
         info!(log, "Libp2p Service"; "peer_id" => format!("{:?}", local_peer_id));
 

beacon_node/network/src/message_handler.rs

@@ -73,11 +73,7 @@ impl<T: BeaconChainTypes + 'static> MessageHandler<T> {
                 .for_each(move |msg| Ok(handler.handle_message(msg)))
                 .map_err(move |_| {
                     debug!(log, "Network message handler terminated.");
-                }), /*
-                    .then(move |_| {
-                        debug!(log.clone(), "Message handler shutdown");
                 }),
-                    */
         );
 
         Ok(handler_send)

beacon_node/network/src/sync/manager.rs

@@ -648,7 +648,6 @@ impl<T: BeaconChainTypes> SyncManager<T> {
 
         // process queued block requests
         for (peer_id, block_requests) in self.import_queue.iter_mut() {
-            {
             if block_requests.state == BlockRequestsState::Queued {
                 let request_id = self.current_req_id;
                 block_requests.state = BlockRequestsState::Pending(request_id);
@@ -670,7 +669,6 @@ impl<T: BeaconChainTypes> SyncManager<T> {
             }
         }
     }
-    }
 
     fn process_complete_batches(&mut self) -> bool {
         // This function can queue extra blocks and the main poll loop will need to be re-executed