Logging cleanup

Author: sauliusgrigaitis

eth1/src/download_manager.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use anyhow::{Context as _, Result};
 use eth1_api::{Eth1Api, Eth1ApiToMetrics, Eth1Block};
 use futures::channel::mpsc::UnboundedSender;
-use log::{info, warn};
+use log::{debug, warn};
 use prometheus_metrics::Metrics;
 use reqwest::Client;
 use std_ext::ArcExt as _;
@@ -100,7 +100,7 @@ impl DownloadManager {
                 .await
                 .context(Error::ConnectionError)?;
 
-            info!(
+            debug!(
                 "downloaded {} Eth1 blocks from block {from_block} to block {to_block}",
                 blocks.len(),
             );
@@ -148,7 +148,7 @@ impl DownloadManager {
         let mut from_block = starting_block_number + 1;
 
         if from_block <= latest_block_number {
-            info!(
+            debug!(
                 "will download Eth1 deposits from block {} to block {}",
                 from_block, latest_block_number,
             );
@@ -157,7 +157,7 @@ impl DownloadManager {
         while from_block <= latest_block_number {
             let to_block = latest_block_number.min(from_block + DEPOSIT_BATCH_SIZE - 1);
 
-            info!("downloading Eth1 deposits from block {from_block} to block {to_block}");
+            debug!("downloading Eth1 deposits from block {from_block} to block {to_block}");
 
             let deposit_event_map = self.api.get_deposit_events(from_block..=to_block).await?;
             let deposit_events = deposit_event_map.values().flatten().collect();

eth1/src/eth1_chain.rs

@@ -8,7 +8,7 @@ use futures::{
     channel::mpsc::UnboundedSender,
     stream::{Stream, TryStreamExt as _},
 };
-use log::{error, info};
+use log::{debug, error};
 use prometheus_metrics::Metrics;
 use reqwest::Client;
 use std_ext::ArcExt as _;
@@ -194,7 +194,7 @@ async fn download_deposits_and_blocks(
     eth1_api_to_metrics_tx: Option<UnboundedSender<Eth1ApiToMetrics>>,
     metrics: Option<Arc<Metrics>>,
 ) -> Result<()> {
-    info!(
+    debug!(
         "started new Eth1 deposit download task (deposit contract {:?})",
         chain_config.deposit_contract_address,
     );
@@ -209,7 +209,7 @@ async fn download_deposits_and_blocks(
     );
 
     loop {
-        info!("started Eth1 deposit download task");
+        debug!("started Eth1 deposit download task");
 
         match download_manager.download_and_store_deposits().await {
             Ok(block_number) => {
@@ -228,7 +228,7 @@ async fn download_deposits_and_blocks(
     }
 
     loop {
-        info!("started Eth1 block download task");
+        debug!("started Eth1 block download task");
 
         if let Err(error) = download_manager.download_and_store_blocks().await {
             handle_error(&error);

fork_choice_store/src/store.rs

@@ -2026,17 +2026,27 @@ impl<P: Preset> Store<P> {
         let justified_checkpoint_updated = old_justified_checkpoint != self.justified_checkpoint;
         let finalized_checkpoint_updated = old_finalized_checkpoint != self.finalized_checkpoint;
 
-        // Temporary logging for debugging
-        if let Some(post_deneb_block_body) = chain_link.block.message().body().post_deneb() {
-            if self.should_check_data_availability_at_slot(chain_link.slot()) {
-                let blob_count = post_deneb_block_body.blob_kzg_commitments().len();
-
-                log::info!(
-                    "imported {blob_count}/{blob_count} blobs for beacon block: {block_root:?}, slot: {}",
-                    chain_link.slot()
-                );
+        let log_imported_block_info = || {
+            if let Some(post_deneb_block_body) = chain_link.block.message().body().post_deneb() {
+                if self.should_check_data_availability_at_slot(chain_link.slot()) {
+                    let blob_count = post_deneb_block_body.blob_kzg_commitments().len();
+
+                    log::info!(
+                        "imported beacon block with {blob_count} blobs (slot: {}, {block_root:?}",
+                        chain_link.slot(),
+                    );
+
+                    return;
+                }
             }
-        }
+
+            log::info!(
+                "imported beacon block (slot: {}, {block_root:?})",
+                chain_link.slot(),
+            );
+        };
+
+        log_imported_block_info();
 
         self.insert_block(chain_link)?;
 

p2p/src/block_sync_service.rs

@@ -368,7 +368,7 @@ impl<P: Preset> BlockSyncService<P> {
                                     metrics.observe_block_duration_to_slot(block_slot_timestamp);
                                 }
 
-                                info!(
+                                debug!(
                                     "received beacon block as gossip (slot: {block_slot}, root: {block_root:?}, \
                                     peer_id: {peer_id})"
                                 );

p2p/src/network.rs

@@ -1601,7 +1601,7 @@ impl<P: Preset> Network<P> {
 
     fn check_status(&self, local: &StatusMessage, remote: StatusMessage, peer_id: PeerId) {
         if local.fork_digest != remote.fork_digest {
-            warn!(
+            debug!(
                 "local fork digest doesn't match remote fork digest \
                 (local: {local:?}, remote: {remote:?}, peer_id: {peer_id}); \
                 disconnecting from peer",
@@ -1660,7 +1660,7 @@ impl<P: Preset> Network<P> {
 
         if let Some(root) = local_finalized_root_at_remote_finalized_epoch {
             if root != remote.finalized_root {
-                warn!(
+                debug!(
                     "peer {peer_id} has different block finalized at epoch {} ({root:?} != {:?})",
                     remote.finalized_epoch, remote.finalized_root,
                 );
@@ -1932,7 +1932,7 @@ fn run_network_service<P: Preset>(
                         }
                         ServiceInboundMessage::SendRequest(peer_id, request_id, request) => {
                             if let Err(error) = service.send_request(peer_id, request_id, request) {
-                                warn!("Unable to send request to peer: {peer_id}: {error:?}");
+                                debug!("Unable to send request to peer: {peer_id}: {error:?}");
                             }
                         }
                         ServiceInboundMessage::SendResponse(peer_id, peer_request_id, request_id, response) => {

validator/src/validator.rs

@@ -38,7 +38,7 @@ use http_api_utils::EventChannels;
 use itertools::Itertools as _;
 use keymanager::ProposerConfigs;
 use liveness_tracker::ValidatorToLiveness;
-use log::{debug, error, info, log, warn, Level};
+use log::{debug, error, info, warn};
 use once_cell::sync::OnceCell;
 use operation_pools::{AttestationAggPool, Origin, PoolAdditionOutcome, SyncCommitteeAggPool};
 use p2p::{P2pToValidator, ToSubnetService, ValidatorToP2p};
@@ -484,14 +484,7 @@ impl<P: Preset, W: Wait + Sync> Validator<P, W> {
             && self.registered_validators.is_empty()
             && self.block_producer.no_prepared_proposers().await;
 
-        log!(
-            if no_validators {
-                Level::Debug
-            } else {
-                Level::Info
-            },
-            "{kind:?} tick in slot {slot}",
-        );
+        debug!("{kind:?} tick in slot {slot}");
 
         let current_epoch = misc::compute_epoch_at_slot::<P>(slot);