Merge of #6589

sigp · Dec 16, 2024 · eb06a14 · eb06a14
2 parents d3aa3e4 + 11cf30a
commit eb06a14
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/beacon_node/lighthouse_network/src/service/api_types.rs b/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.

diff --git a/beacon_node/network/src/sync/network_context.rs b/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(),
         );