Merge of #6589

Author: mergify[bot]

beacon_node/lighthouse_network/src/service/api_types.rs

@@ -67,7 +67,6 @@ pub struct SamplingRequestId(pub usize);
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
 pub struct CustodyId {
     pub requester: CustodyRequester,
-    pub req_id: Id,
 }
 
 /// Downstream components that perform custody by root requests.

beacon_node/network/src/sync/network_context.rs

@@ -763,8 +763,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
         let requester = CustodyRequester(id);
         let mut request = ActiveCustodyRequest::new(
             block_root,
-            // TODO(das): req_id is duplicated here, also present in id
-            CustodyId { requester, req_id },
+            CustodyId { requester },
             &custody_indexes_to_fetch,
             self.log.clone(),
         );