gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-07-04 13:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove RequestState trait from lookup sync (#9391)

Browse Source 
Co-Authored-By: dapplion <35266934+dapplion@users.noreply.github.com>
This commit is contained in:
Lion - dapplion
2026-06-03 17:29:04 +02:00
committed by GitHub
parent c2ac519c69
commit eab5163d68
6 changed files with 369 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
beacon_node/network/src/sync/network_context/custody.rs
View File

@@ -1,3 +1,4 @@
use crate::sync::block_lookups::DownloadResult;
use crate::sync::network_context::{
DataColumnsByRootRequestId, DataColumnsByRootSingleBlockRequest,
};
@@ -56,8 +57,7 @@ struct ActiveBatchColumnsRequest {
span: Span,
}
pub type CustodyRequestResult<E> =
Result<Option<(DataColumnSidecarList<E>, PeerGroup, Duration)>, Error>;
pub type CustodyRequestResult<E> = Result<Option<DownloadResult<DataColumnSidecarList<E>>>, Error>;
impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
pub(crate) fn new(
@@ -227,7 +227,11 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
.into_iter()
.max()
.unwrap_or_else(|| cx.chain.slot_clock.now_duration().unwrap_or_default());
return Ok(Some((columns, peer_group, max_seen_timestamp)));
return Ok(Some(DownloadResult::new(
columns,
peer_group,
max_seen_timestamp,
)));
}
let active_request_count_by_peer = cx.active_request_count_by_peer();
@@ -343,7 +347,7 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
},
);
}
LookupRequestResult::NoRequestNeeded(_) => unreachable!(),
LookupRequestResult::NoRequestNeeded(..) => unreachable!(),
LookupRequestResult::Pending(_) => unreachable!(),
}
}