From ba758c5f5472f442ec0791447d71c44a642bcab1 Mon Sep 17 00:00:00 2001 From: Roman Krasiuk Date: Thu, 8 Dec 2022 14:53:56 +0200 Subject: [PATCH] chore(sync): remove timeout from downloader (#356) --- crates/interfaces/src/p2p/headers/downloader.rs | 5 +---- crates/interfaces/src/test_utils/headers.rs | 5 ----- crates/net/headers-downloaders/src/linear.rs | 9 --------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/crates/interfaces/src/p2p/headers/downloader.rs b/crates/interfaces/src/p2p/headers/downloader.rs index c64d707b89..442e66c3af 100644 --- a/crates/interfaces/src/p2p/headers/downloader.rs +++ b/crates/interfaces/src/p2p/headers/downloader.rs @@ -7,7 +7,7 @@ use crate::{ use futures::Stream; use reth_primitives::SealedHeader; use reth_rpc_types::engine::ForkchoiceState; -use std::{pin::Pin, time::Duration}; +use std::pin::Pin; /// A Future for downloading a batch of headers. pub type HeaderBatchDownload<'a> = Pin< @@ -38,9 +38,6 @@ pub trait HeaderDownloader: Sync + Send + Unpin { /// The Client used to download the headers type Client: HeadersClient; - /// The request timeout duration - fn timeout(&self) -> Duration; - /// The consensus engine fn consensus(&self) -> &Self::Consensus; diff --git a/crates/interfaces/src/test_utils/headers.rs b/crates/interfaces/src/test_utils/headers.rs index 70f8d67b39..6857a87e42 100644 --- a/crates/interfaces/src/test_utils/headers.rs +++ b/crates/interfaces/src/test_utils/headers.rs @@ -24,7 +24,6 @@ use std::{ Arc, }, task::{ready, Context, Poll}, - time::Duration, }; use tokio::sync::{watch, Mutex}; @@ -59,10 +58,6 @@ impl HeaderDownloader for TestHeaderDownloader { type Consensus = TestConsensus; type Client = TestHeadersClient; - fn timeout(&self) -> Duration { - Duration::from_millis(1000) - } - fn consensus(&self) -> &Self::Consensus { &self.consensus } diff --git a/crates/net/headers-downloaders/src/linear.rs b/crates/net/headers-downloaders/src/linear.rs index 28c6656d26..d423a2cb29 100644 --- a/crates/net/headers-downloaders/src/linear.rs +++ b/crates/net/headers-downloaders/src/linear.rs @@ -35,8 +35,6 @@ pub struct LinearDownloader { client: Arc, /// The batch size per one request pub batch_size: u64, - /// A single request timeout - pub request_timeout: Duration, /// The number of retries for downloading pub request_retries: usize, } @@ -49,11 +47,6 @@ where type Consensus = C; type Client = H; - /// The request timeout - fn timeout(&self) -> Duration { - self.request_timeout - } - fn consensus(&self) -> &Self::Consensus { self.consensus.borrow() } @@ -77,7 +70,6 @@ impl Clone for LinearDownloader { consensus: Arc::clone(&self.consensus), client: Arc::clone(&self.client), batch_size: self.batch_size, - request_timeout: self.request_timeout, request_retries: self.request_retries, } } @@ -422,7 +414,6 @@ impl LinearDownloadBuilder { consensus, client, batch_size: self.batch_size, - request_timeout: self.request_timeout, request_retries: self.request_retries, } }