diff --git a/polkadot/node/network/availability-recovery/src/lib.rs b/polkadot/node/network/availability-recovery/src/lib.rs index efd8d371285155246d1f3f71d54e3b29d1bb4d4b..ccbeba620472eb9386070ef5a0f3b9fe49c63729 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 709855e353af7ddb27a80b5273f3ff374ee50c67..128733088ba797e4925258dd2e2ddefd7bf6b02b 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; } }