jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 19:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: convert HeadersClient BodiesClient futures into associated types (#1063)

Browse Source
This commit is contained in:
Aurélien
2023-01-30 10:25:15 +01:00
committed by GitHub
parent 0c2225956d
commit e2ac4d3f3c
15 changed files with 214 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/net/downloaders/src/bodies/request.rs
View File

@ -5,7 +5,7 @@ use reth_interfaces::{
consensus::{Consensus as ConsensusTrait, Consensus},
p2p::{
bodies::{client::BodiesClient, response::BlockResponse},
error::{DownloadError, PeerRequestResult},
error::DownloadError,
},
};
use reth_primitives::{PeerId, SealedBlock, SealedHeader, H256};
@ -15,8 +15,6 @@ use std::{
task::{ready, Context, Poll},
};
type BodiesFut = Pin<Box<dyn Future<Output = PeerRequestResult<Vec<BlockBody>>> + Send>>;
/// Body request implemented as a [Future].
///
/// The future will poll the underlying request until fullfilled.
@ -36,7 +34,7 @@ type BodiesFut = Pin<Box<dyn Future<Output = PeerRequestResult<Vec<BlockBody>>>
/// All errors regarding the response cause the peer to get penalized, meaning that adversaries
/// that try to give us bodies that do not match the requested order are going to be penalized
/// and eventually disconnected.
pub(crate) struct BodiesRequestFuture<B> {
pub(crate) struct BodiesRequestFuture<B: BodiesClient> {
client: Arc<B>,
consensus: Arc<dyn Consensus>,
metrics: DownloaderMetrics,
@ -45,7 +43,7 @@ pub(crate) struct BodiesRequestFuture<B> {
// Remaining hashes to download
hashes_to_download: Vec<H256>,
buffer: Vec<(PeerId, BlockBody)>,
fut: Option<BodiesFut>,
fut: Option<B::Output>,
}
impl<B> BodiesRequestFuture<B>
@ -93,7 +91,7 @@ where
let client = Arc::clone(&self.client);
let request = self.hashes_to_download.clone();
tracing::trace!(target: "downloaders::bodies", request_len = request.len(), "Requesting bodies");
self.fut = Some(Box::pin(async move { client.get_block_bodies(request).await }));
self.fut = Some(client.get_block_bodies(request));
}
fn reset_hashes(&mut self) {