From e76b69ea3817cadf12ae074f45709585339cad04 Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jchen.tc@gmail.com>
Date: Wed, 12 Feb 2025 17:14:57 +1100
Subject: [PATCH 1/2] Add missing error log and remove redundant id field from
 lookup logs.

---
 beacon_node/network/src/sync/network_context.rs         | 8 ++++++++
 beacon_node/network/src/sync/network_context/custody.rs | 4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/beacon_node/network/src/sync/network_context.rs b/beacon_node/network/src/sync/network_context.rs
index 968a9bcdddc..5faf7cfbfcc 100644
--- a/beacon_node/network/src/sync/network_context.rs
+++ b/beacon_node/network/src/sync/network_context.rs
@@ -486,6 +486,14 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
             let request = entry.remove();
             let blocks = request
                 .into_responses(&self.chain.spec)
+                .inspect_err(|e| {
+                    debug!(
+                        self.log,
+                        "Failed to convert range block components into RpcBlock";
+                        "id" => %id,
+                        "error" => e
+                    )
+                })
                 .map_err(RpcResponseError::BlockComponentCouplingError);
             Some(blocks)
         } else {
diff --git a/beacon_node/network/src/sync/network_context/custody.rs b/beacon_node/network/src/sync/network_context/custody.rs
index 38353d3ea24..f10d9473574 100644
--- a/beacon_node/network/src/sync/network_context/custody.rs
+++ b/beacon_node/network/src/sync/network_context/custody.rs
@@ -106,7 +106,6 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
         let Some(batch_request) = self.active_batch_columns_requests.get_mut(&req_id) else {
             warn!(self.log,
                 "Received custody column response for unrequested index";
-                "id" => ?self.custody_id,
                 "block_root" => ?self.block_root,
                 "req_id" => %req_id,
             );
@@ -117,7 +116,6 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
             Ok((data_columns, seen_timestamp)) => {
                 debug!(self.log,
                     "Custody column download success";
-                    "id" => ?self.custody_id,
                     "block_root" => ?self.block_root,
                     "req_id" => %req_id,
                     "peer" => %peer_id,
@@ -165,7 +163,6 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
                     // Note: Batch logging that columns are missing to not spam logger
                     debug!(self.log,
                         "Custody column peer claims to not have some data";
-                        "id" => ?self.custody_id,
                         "block_root" => ?self.block_root,
                         "req_id" => %req_id,
                         "peer" => %peer_id,
@@ -179,7 +176,6 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
             Err(err) => {
                 debug!(self.log,
                     "Custody column download error";
-                    "id" => ?self.custody_id,
                     "block_root" => ?self.block_root,
                     "req_id" => %req_id,
                     "peer" => %peer_id,

From 5eb0c6e587c4f4ca5887acf54f869840842db044 Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jchen.tc@gmail.com>
Date: Tue, 1 Apr 2025 18:23:24 +1100
Subject: [PATCH 2/2] Delete logging.

---
 beacon_node/network/src/sync/network_context.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/beacon_node/network/src/sync/network_context.rs b/beacon_node/network/src/sync/network_context.rs
index 5faf7cfbfcc..968a9bcdddc 100644
--- a/beacon_node/network/src/sync/network_context.rs
+++ b/beacon_node/network/src/sync/network_context.rs
@@ -486,14 +486,6 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
             let request = entry.remove();
             let blocks = request
                 .into_responses(&self.chain.spec)
-                .inspect_err(|e| {
-                    debug!(
-                        self.log,
-                        "Failed to convert range block components into RpcBlock";
-                        "id" => %id,
-                        "error" => e
-                    )
-                })
                 .map_err(RpcResponseError::BlockComponentCouplingError);
             Some(blocks)
         } else {