From b82eac4b00a67ec385a9a60eeca81a4b40d40678 Mon Sep 17 00:00:00 2001 From: Ikechukwu Ahiara Marvellous Date: Fri, 10 Feb 2023 22:58:05 +0100 Subject: [PATCH] Unify builder argument order (#1276) --- bin/reth/src/chain/import.rs | 2 +- bin/reth/src/node/mod.rs | 2 +- .../net/downloaders/src/headers/reverse_headers.rs | 12 ++++++------ crates/net/downloaders/src/headers/task.rs | 6 +++--- crates/net/downloaders/src/test_utils/file_client.rs | 4 ++-- crates/stages/src/lib.rs | 4 ++-- crates/stages/src/stages/headers.rs | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bin/reth/src/chain/import.rs b/bin/reth/src/chain/import.rs index c882d59a3..4dfb267b5 100644 --- a/bin/reth/src/chain/import.rs +++ b/bin/reth/src/chain/import.rs @@ -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) diff --git a/bin/reth/src/node/mod.rs b/bin/reth/src/node/mod.rs index 9250926e0..6edd7bb82 100644 --- a/bin/reth/src/node/mod.rs +++ b/bin/reth/src/node/mod.rs @@ -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) diff --git a/crates/net/downloaders/src/headers/reverse_headers.rs b/crates/net/downloaders/src/headers/reverse_headers.rs index fd547d6c5..c213b327a 100644 --- a/crates/net/downloaders/src/headers/reverse_headers.rs +++ b/crates/net/downloaders/src/headers/reverse_headers.rs @@ -888,8 +888,8 @@ impl ReverseHeadersDownloaderBuilder { /// and header client implementations pub fn build( self, - consensus: Arc, client: Arc, + consensus: Arc, ) -> ReverseHeadersDownloader 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())); diff --git a/crates/net/downloaders/src/headers/task.rs b/crates/net/downloaders/src/headers/task.rs index 320621022..23a642bab 100644 --- a/crates/net/downloaders/src/headers/task.rs +++ b/crates/net/downloaders/src/headers/task.rs @@ -46,9 +46,9 @@ impl TaskDownloader { /// # use reth_interfaces::p2p::headers::client::HeadersClient; /// # fn t(consensus:Arc, client: Arc) { /// let downloader = ReverseHeadersDownloader::::builder().build( - /// consensus, /// client, - /// ); + /// consensus + /// ); /// let downloader = TaskDownloader::spawn(downloader); /// # } pub fn spawn(downloader: T) -> Self @@ -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()); diff --git a/crates/net/downloaders/src/test_utils/file_client.rs b/crates/net/downloaders/src/test_utils/file_client.rs index 8fb483609..029eb648e 100644 --- a/crates/net/downloaders/src/test_utils/file_client.rs +++ b/crates/net/downloaders/src/test_utils/file_client.rs @@ -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())); diff --git a/crates/stages/src/lib.rs b/crates/stages/src/lib.rs index 211b2bd12..70b32da83 100644 --- a/crates/stages/src/lib.rs +++ b/crates/stages/src/lib.rs @@ -32,8 +32,8 @@ //! # use reth_stages::sets::DefaultStages; //! # let consensus: Arc = 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()) }), diff --git a/crates/stages/src/stages/headers.rs b/crates/stages/src/stages/headers.rs index 9bbb46c03..0dc9019af 100644 --- a/crates/stages/src/stages/headers.rs +++ b/crates/stages/src/stages/headers.rs @@ -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(), }