From f293fb1025c36401ab5f0655abfdccdd016cff7c Mon Sep 17 00:00:00 2001
From: Robert Klotzner <eskimor@users.noreply.github.com>
Date: Thu, 1 Jul 2021 08:44:13 +0200
Subject: [PATCH] Fix busy loops. (#3392)
---
polkadot/node/network/availability-recovery/src/lib.rs | 4 ++--
.../network/collator-protocol/src/validator_side/mod.rs | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/polkadot/node/network/availability-recovery/src/lib.rs b/polkadot/node/network/availability-recovery/src/lib.rs
index efd8d371285..ccbeba62047 100644
--- a/polkadot/node/network/availability-recovery/src/lib.rs
+++ b/polkadot/node/network/availability-recovery/src/lib.rs
@@ -806,8 +806,8 @@ impl AvailabilityRecoverySubsystem {
}
}
}
- output = state.interactions.next() => {
- if let Some((candidate_hash, result)) = output.flatten() {
+ output = state.interactions.select_next_some() => {
+ if let Some((candidate_hash, result)) = output {
state.availability_lru.put(candidate_hash, result);
}
}
diff --git a/polkadot/node/network/collator-protocol/src/validator_side/mod.rs b/polkadot/node/network/collator-protocol/src/validator_side/mod.rs
index 709855e353a..128733088ba 100644
--- a/polkadot/node/network/collator-protocol/src/validator_side/mod.rs
+++ b/polkadot/node/network/collator-protocol/src/validator_side/mod.rs
@@ -1138,10 +1138,8 @@ pub(crate) async fn run<Context>(
_ = next_inactivity_stream.next() => {
disconnect_inactive_peers(&mut ctx, &eviction_policy, &state.peer_data).await;
}
- res = state.collation_fetches.next() => {
- if let Some(res) = res {
- handle_collation_fetched_result(&mut ctx, &mut state, res).await;
- }
+ res = state.collation_fetches.select_next_some() => {
+ handle_collation_fetched_result(&mut ctx, &mut state, res).await;
}
}
--
GitLab