gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-19 12:56:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nest lookup type into request id SingleBlock and SingleBlob (#5562)

Browse Source 
* Nest lookup type into block lookup RequestId
This commit is contained in:
Lion - dapplion
2024-04-12 01:32:06 +09:00
committed by GitHub
parent 3d4e6e263e
commit 34dbb32610
6 changed files with 107 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
beacon_node/network/src/sync/block_lookups/common.rs
View File

@@ -25,7 +25,7 @@ pub enum ResponseType {
Blob,
}
#[derive(Debug, Copy, Clone)]
#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
pub enum LookupType {
Current,
Parent,
@@ -119,6 +119,7 @@ pub trait RequestState<L: Lookup, T: BeaconChainTypes> {
let id = SingleLookupReqId {
id,
req_counter: self.get_state().req_counter,
lookup_type: L::lookup_type(),
};
Self::make_request(id, peer_id, request, cx)
}
@@ -265,7 +266,7 @@ impl<L: Lookup, T: BeaconChainTypes> RequestState<L, T> for BlockRequestState<L>
request: Self::RequestType,
cx: &SyncNetworkContext<T>,
) -> Result<(), LookupRequestError> {
cx.block_lookup_request(id, peer_id, request, L::lookup_type())
cx.block_lookup_request(id, peer_id, request)
.map_err(LookupRequestError::SendFailed)
}
@@ -365,7 +366,7 @@ impl<L: Lookup, T: BeaconChainTypes> RequestState<L, T> for BlobRequestState<L,
request: Self::RequestType,
cx: &SyncNetworkContext<T>,
) -> Result<(), LookupRequestError> {
cx.blob_lookup_request(id, peer_id, request, L::lookup_type())
cx.blob_lookup_request(id, peer_id, request)
.map_err(LookupRequestError::SendFailed)
}