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

Unify builder argument order (#1276)

Browse Source
This commit is contained in:
Ikechukwu Ahiara Marvellous
2023-02-10 22:58:05 +01:00
committed by GitHub
parent 00a49f5ee7
commit b82eac4b00
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/reth/src/chain/import.rs
View File

@ -126,7 +126,7 @@ impl ImportCommand {
C: Consensus + 'static,
{
let header_downloader = ReverseHeadersDownloaderBuilder::from(config.stages.headers)
.build(consensus.clone(), file_client.clone())
.build(file_client.clone(), consensus.clone())
.as_task();
let body_downloader = BodiesDownloaderBuilder::from(config.stages.bodies)

2
bin/reth/src/node/mod.rs
View File

@ -173,7 +173,7 @@ impl Command {
let fetch_client = Arc::new(network.fetch_client().await?);
let header_downloader = ReverseHeadersDownloaderBuilder::from(config.stages.headers)
.build(consensus.clone(), fetch_client.clone())
.build(fetch_client.clone(), consensus.clone())
.as_task();
let body_downloader = BodiesDownloaderBuilder::from(config.stages.bodies)

12
crates/net/downloaders/src/headers/reverse_headers.rs
View File

@ -888,8 +888,8 @@ impl ReverseHeadersDownloaderBuilder {
/// and header client implementations
pub fn build<H>(
self,
consensus: Arc<dyn Consensus>,
client: Arc<H>,
consensus: Arc<dyn Consensus>,
) -> ReverseHeadersDownloader<H>
where
H: HeadersClient + 'static,
@ -961,7 +961,7 @@ mod tests {
let genesis = SealedHeader::default();
let mut downloader = ReverseHeadersDownloaderBuilder::default()
.build(Arc::new(TestConsensus::default()), Arc::clone(&client));
.build(Arc::clone(&client), Arc::new(TestConsensus::default()));
downloader.update_local_head(genesis);
downloader.update_sync_target(SyncTarget::Tip(H256::random()));
@ -989,7 +989,7 @@ mod tests {
let header = SealedHeader::default();
let mut downloader = ReverseHeadersDownloaderBuilder::default()
.build(Arc::new(TestConsensus::default()), Arc::clone(&client));
.build(Arc::clone(&client), Arc::new(TestConsensus::default()));
downloader.update_local_head(header.clone());
downloader.update_sync_target(SyncTarget::Tip(H256::random()));
@ -1030,7 +1030,7 @@ mod tests {
let start = 1000;
let mut downloader = ReverseHeadersDownloaderBuilder::default()
.request_limit(batch_size)
.build(Arc::new(TestConsensus::default()), Arc::clone(&client));
.build(Arc::clone(&client), Arc::new(TestConsensus::default()));
downloader.update_local_head(genesis);
downloader.update_sync_target(SyncTarget::Tip(H256::random()));
@ -1080,7 +1080,7 @@ mod tests {
let mut downloader = ReverseHeadersDownloaderBuilder::default()
.stream_batch_size(3)
.request_limit(3)
.build(Arc::new(TestConsensus::default()), Arc::clone(&client));
.build(Arc::clone(&client), Arc::new(TestConsensus::default()));
downloader.update_local_head(p3.clone());
downloader.update_sync_target(SyncTarget::Tip(p0.hash()));
@ -1112,7 +1112,7 @@ mod tests {
let mut downloader = ReverseHeadersDownloaderBuilder::default()
.stream_batch_size(1)
.request_limit(1)
.build(Arc::new(TestConsensus::default()), Arc::clone(&client));
.build(Arc::clone(&client), Arc::new(TestConsensus::default()));
downloader.update_local_head(p3.clone());
downloader.update_sync_target(SyncTarget::Tip(p0.hash()));

4
crates/net/downloaders/src/headers/task.rs
View File

@ -46,8 +46,8 @@ impl TaskDownloader {
/// # use reth_interfaces::p2p::headers::client::HeadersClient;
/// # fn t<H: HeadersClient + 'static>(consensus:Arc<dyn Consensus>, client: Arc<H>) {
/// let downloader = ReverseHeadersDownloader::<H>::builder().build(
/// consensus,
/// client,
/// consensus
/// );
/// let downloader = TaskDownloader::spawn(downloader);
/// # }
@ -172,7 +172,7 @@ mod tests {
let downloader = ReverseHeadersDownloaderBuilder::default()
.stream_batch_size(1)
.request_limit(1)
.build(Arc::new(TestConsensus::default()), Arc::clone(&client));
.build(Arc::clone(&client), Arc::new(TestConsensus::default()));
let mut downloader = TaskDownloader::spawn(downloader);
downloader.update_local_head(p3.clone());

4
crates/net/downloaders/src/test_utils/file_client.rs
View File

@ -309,7 +309,7 @@ mod tests {
let mut downloader = ReverseHeadersDownloaderBuilder::default()
.stream_batch_size(3)
.request_limit(3)
.build(Arc::new(TestConsensus::default()), Arc::clone(&client));
.build(Arc::clone(&client), Arc::new(TestConsensus::default()));
downloader.update_local_head(p3.clone());
downloader.update_sync_target(SyncTarget::Tip(p0.hash()));
@ -330,7 +330,7 @@ mod tests {
// construct headers downloader and use first header
let mut header_downloader = ReverseHeadersDownloaderBuilder::default()
.build(Arc::new(TestConsensus::default()), Arc::clone(&client));
.build(Arc::clone(&client), Arc::new(TestConsensus::default()));
header_downloader.update_local_head(headers.first().unwrap().clone());
header_downloader.update_sync_target(SyncTarget::Tip(headers.last().unwrap().hash()));

4
crates/stages/src/lib.rs
View File

@ -32,8 +32,8 @@
//! # use reth_stages::sets::DefaultStages;
//! # let consensus: Arc<dyn Consensus> = Arc::new(TestConsensus::default());
//! # let headers_downloader = ReverseHeadersDownloaderBuilder::default().build(
//! # consensus.clone(),
//! # Arc::new(TestHeadersClient::default())
//! # Arc::new(TestHeadersClient::default()),
//! # consensus.clone()
//! # );
//! # let bodies_downloader = BodiesDownloaderBuilder::default().build(
//! # Arc::new(TestBodiesClient { responder: |_| Ok((PeerId::zero(), vec![]).into()) }),

2
crates/stages/src/stages/headers.rs
View File

@ -423,7 +423,7 @@ mod tests {
downloader_factory: Box::new(move || {
ReverseHeadersDownloaderBuilder::default()
.stream_batch_size(500)
.build(consensus.clone(), client.clone())
.build(client.clone(), consensus.clone())
}),
tx: TestTransaction::default(),
}