From e5a0fc655034f82af572d2d7cccdf2dfd9b0e141 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Sat, 11 Mar 2023 15:27:24 +0100 Subject: [PATCH] chore(clippy): make clippy happy (#1710) --- bin/reth/src/node/mod.rs | 6 +-- bin/reth/src/p2p/mod.rs | 2 +- crates/net/discv4/src/lib.rs | 4 +- crates/net/discv4/src/test_utils.rs | 4 +- crates/net/dns/src/query.rs | 9 ++-- crates/net/downloaders/src/bodies/task.rs | 2 +- crates/net/downloaders/src/headers/task.rs | 2 +- crates/net/network/src/session/mod.rs | 54 +++++++++----------- crates/net/network/src/test_utils/testnet.rs | 2 +- crates/net/network/src/transactions.rs | 2 + crates/stages/src/pipeline/mod.rs | 4 +- 11 files changed, 43 insertions(+), 48 deletions(-) diff --git a/bin/reth/src/node/mod.rs b/bin/reth/src/node/mod.rs index 1cd2a6b2a..74f5a4738 100644 --- a/bin/reth/src/node/mod.rs +++ b/bin/reth/src/node/mod.rs @@ -342,11 +342,11 @@ impl Command { NetworkManager::builder(config).await?.request_handler(client).split_with_handle(); let known_peers_file = self.network.persistent_peers_file(); - task_executor.spawn_critical_with_signal("p2p network task", |shutdown| async move { - run_network_until_shutdown(shutdown, network, known_peers_file).await + task_executor.spawn_critical_with_signal("p2p network task", |shutdown| { + run_network_until_shutdown(shutdown, network, known_peers_file) }); - task_executor.spawn_critical("p2p eth request handler", async move { eth.await }); + task_executor.spawn_critical("p2p eth request handler", eth); // TODO spawn pool diff --git a/bin/reth/src/p2p/mod.rs b/bin/reth/src/p2p/mod.rs index d8b27777b..268168de4 100644 --- a/bin/reth/src/p2p/mod.rs +++ b/bin/reth/src/p2p/mod.rs @@ -137,7 +137,7 @@ impl Command { }; let (_, result) = (move || { let client = fetch_client.clone(); - async move { client.get_block_bodies(vec![hash]).await } + client.get_block_bodies(vec![hash]) }) .retry(&backoff) .notify(|err, _| println!("Error requesting block: {err}. Retrying...")) diff --git a/crates/net/discv4/src/lib.rs b/crates/net/discv4/src/lib.rs index d0fadddac..c5bee3003 100644 --- a/crates/net/discv4/src/lib.rs +++ b/crates/net/discv4/src/lib.rs @@ -406,10 +406,10 @@ impl Discv4Service { let mut tasks = JoinSet::<()>::new(); let udp = Arc::clone(&socket); - tasks.spawn(async move { receive_loop(udp, ingress_tx, local_node_record.id).await }); + tasks.spawn(receive_loop(udp, ingress_tx, local_node_record.id)); let udp = Arc::clone(&socket); - tasks.spawn(async move { send_loop(udp, egress_rx).await }); + tasks.spawn(send_loop(udp, egress_rx)); let kbuckets = KBucketsTable::new( NodeKey::from(&local_node_record).into(), diff --git a/crates/net/discv4/src/test_utils.rs b/crates/net/discv4/src/test_utils.rs index 0657ec98a..d3de9fc26 100644 --- a/crates/net/discv4/src/test_utils.rs +++ b/crates/net/discv4/src/test_utils.rs @@ -65,10 +65,10 @@ impl MockDiscovery { let mut tasks = JoinSet::<()>::new(); let udp = Arc::clone(&socket); - tasks.spawn(async move { receive_loop(udp, ingress_tx, local_enr.id).await }); + tasks.spawn(receive_loop(udp, ingress_tx, local_enr.id)); let udp = Arc::clone(&socket); - tasks.spawn(async move { send_loop(udp, egress_rx).await }); + tasks.spawn(send_loop(udp, egress_rx)); let (tx, command_rx) = mpsc::channel(128); let this = Self { diff --git a/crates/net/dns/src/query.rs b/crates/net/dns/src/query.rs index 34b5deccc..9ef45bcec 100644 --- a/crates/net/dns/src/query.rs +++ b/crates/net/dns/src/query.rs @@ -59,18 +59,15 @@ impl QueryPool { pub(crate) fn resolve_root(&mut self, link: LinkEntry) { let resolver = Arc::clone(&self.resolver); let timeout = self.lookup_timeout; - self.queued_queries.push_back(Query::Root(Box::pin(async move { - resolve_root(resolver, link, timeout).await - }))) + self.queued_queries.push_back(Query::Root(Box::pin(resolve_root(resolver, link, timeout)))) } /// Resolves the [DnsEntry] for `` pub(crate) fn resolve_entry(&mut self, link: LinkEntry, hash: String, kind: ResolveKind) { let resolver = Arc::clone(&self.resolver); let timeout = self.lookup_timeout; - self.queued_queries.push_back(Query::Entry(Box::pin(async move { - resolve_entry(resolver, link, hash, kind, timeout).await - }))) + self.queued_queries + .push_back(Query::Entry(Box::pin(resolve_entry(resolver, link, hash, kind, timeout)))) } /// Advances the state of the queries diff --git a/crates/net/downloaders/src/bodies/task.rs b/crates/net/downloaders/src/bodies/task.rs index a59c7d9e4..bf7ced932 100644 --- a/crates/net/downloaders/src/bodies/task.rs +++ b/crates/net/downloaders/src/bodies/task.rs @@ -76,7 +76,7 @@ impl TaskDownloader { downloader, }; - spawner.spawn(async move { downloader.await }.boxed()); + spawner.spawn(downloader.boxed()); Self { from_downloader: UnboundedReceiverStream::new(bodies_rx), to_downloader } } diff --git a/crates/net/downloaders/src/headers/task.rs b/crates/net/downloaders/src/headers/task.rs index 1d8a4ab1a..bce7a8d0f 100644 --- a/crates/net/downloaders/src/headers/task.rs +++ b/crates/net/downloaders/src/headers/task.rs @@ -68,7 +68,7 @@ impl TaskDownloader { updates: UnboundedReceiverStream::new(updates_rx), downloader, }; - spawner.spawn(async move { downloader.await }.boxed()); + spawner.spawn(downloader.boxed()); Self { from_downloader: UnboundedReceiverStream::new(headers_rx), to_downloader } } diff --git a/crates/net/network/src/session/mod.rs b/crates/net/network/src/session/mod.rs index f617c9516..03d67f915 100644 --- a/crates/net/network/src/session/mod.rs +++ b/crates/net/network/src/session/mod.rs @@ -169,7 +169,7 @@ impl SessionManager { where F: Future + Send + 'static, { - self.executor.spawn(async move { f.await }.boxed()); + self.executor.spawn(f.boxed()); } /// Invoked on a received status update. @@ -209,20 +209,17 @@ impl SessionManager { let hello_message = self.hello_message.clone(); let status = self.status; let fork_filter = self.fork_filter.clone(); - self.spawn(async move { - start_pending_incoming_session( - disconnect_rx, - session_id, - metered_stream, - pending_events, - remote_addr, - secret_key, - hello_message, - status, - fork_filter, - ) - .await - }); + self.spawn(start_pending_incoming_session( + disconnect_rx, + session_id, + metered_stream, + pending_events, + remote_addr, + secret_key, + hello_message, + status, + fork_filter, + )); let handle = PendingSessionHandle { disconnect_tx: Some(disconnect_tx), @@ -243,21 +240,18 @@ impl SessionManager { let fork_filter = self.fork_filter.clone(); let status = self.status; let band_with_meter = self.bandwidth_meter.clone(); - self.spawn(async move { - start_pending_outbound_session( - disconnect_rx, - pending_events, - session_id, - remote_addr, - remote_peer_id, - secret_key, - hello_message, - status, - fork_filter, - band_with_meter, - ) - .await - }); + self.spawn(start_pending_outbound_session( + disconnect_rx, + pending_events, + session_id, + remote_addr, + remote_peer_id, + secret_key, + hello_message, + status, + fork_filter, + band_with_meter, + )); let handle = PendingSessionHandle { disconnect_tx: Some(disconnect_tx), diff --git a/crates/net/network/src/test_utils/testnet.rs b/crates/net/network/src/test_utils/testnet.rs index b31e4bb32..bfd2645a4 100644 --- a/crates/net/network/src/test_utils/testnet.rs +++ b/crates/net/network/src/test_utils/testnet.rs @@ -77,7 +77,7 @@ where &mut self, configs: impl IntoIterator>, ) -> Result<(), NetworkError> { - let peers = configs.into_iter().map(|c| async { c.launch().await }).collect::>(); + let peers = configs.into_iter().map(|c| c.launch()).collect::>(); let peers = futures::future::join_all(peers).await; for peer in peers { self.peers.push(peer?); diff --git a/crates/net/network/src/transactions.rs b/crates/net/network/src/transactions.rs index 1cf1f0afe..109aec0e1 100644 --- a/crates/net/network/src/transactions.rs +++ b/crates/net/network/src/transactions.rs @@ -431,6 +431,8 @@ where let pool_transaction = ::from_recovered_transaction(tx); let pool = self.pool.clone(); + + #[allow(clippy::redundant_async_block)] let import = Box::pin(async move { pool.add_external_transaction(pool_transaction).await }); diff --git a/crates/stages/src/pipeline/mod.rs b/crates/stages/src/pipeline/mod.rs index cd8bbbac4..b8db11462 100644 --- a/crates/stages/src/pipeline/mod.rs +++ b/crates/stages/src/pipeline/mod.rs @@ -490,7 +490,9 @@ mod tests { let events = pipeline.events(); // Run pipeline - tokio::spawn(async move { pipeline.run(db).await }); + tokio::spawn(async move { + pipeline.run(db).await.unwrap(); + }); // Check that the stages were run in order assert_eq!(