Revert type change in UnexpectedRequestId

dapplion · pawanjay176 · commit c2aa4ae8be61 · 2025-09-25T16:18:47.000-07:00
diff --git a/beacon_node/network/src/sync/network_context/custody.rs b/beacon_node/network/src/sync/network_context/custody.rs
@@ -5,7 +5,7 @@ use beacon_chain::BeaconChainTypes;
 use beacon_chain::validator_monitor::timestamp_now;
 use fnv::FnvHashMap;
 use lighthouse_network::PeerId;
-use lighthouse_network::service::api_types::{CustodyId, DataColumnsByRootRequester, Id};
+use lighthouse_network::service::api_types::{CustodyId, DataColumnsByRootRequester};
 use lighthouse_tracing::SPAN_OUTGOING_CUSTODY_REQUEST;
 use parking_lot::RwLock;
 use std::collections::HashSet;
@@ -46,8 +46,8 @@ pub enum Error {
     /// There should only exist a single request at a time. Having multiple requests is a bug and
     /// can result in undefined state, so it's treated as a hard error and the lookup is dropped.
     UnexpectedRequestId {
-        expected_req_id: Id,
-        req_id: Id,
+        expected_req_id: DataColumnsByRootRequestId,
+        req_id: DataColumnsByRootRequestId,
     },
 }
 
@@ -424,8 +424,8 @@ impl<E: EthSpec> ColumnRequest<E> {
             Status::Downloading(expected_req_id) => {
                 if req_id != *expected_req_id {
                     return Err(Error::UnexpectedRequestId {
-                        expected_req_id: expected_req_id.id,
-                        req_id: req_id.id,
+                        expected_req_id: *expected_req_id,
+                        req_id,
                     });
                 }
                 self.status = Status::NotStarted(Instant::now());
@@ -457,8 +457,8 @@ impl<E: EthSpec> ColumnRequest<E> {
             Status::Downloading(expected_req_id) => {
                 if req_id != *expected_req_id {
                     return Err(Error::UnexpectedRequestId {
-                        expected_req_id: expected_req_id.id,
-                        req_id: req_id.id,
+                        expected_req_id: *expected_req_id,
+                        req_id,
                     });
                 }
                 self.status = Status::Downloaded(peer_id, data_column, seen_timestamp);
