Skip to content

Convert SyncingEngine::run to use tokio::select! instead of polling #2132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmitry-markin merged 7 commits into from
Nov 3, 2023
Merged

Convert SyncingEngine::run to use tokio::select! instead of polling #2132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
432b4f6
Replace `futures_timer::Delay` with `tokio::time::Interval`
dmitry-markin Nov 1, 2023
c0d51e9
Factor out handling commands and events
dmitry-markin Nov 1, 2023
c5ef267
Implement `FusedStream` for `BlockAnnounceValidator`
dmitry-markin Nov 2, 2023
2fc1971
Make `PendingResponses` never terminate
dmitry-markin Nov 2, 2023
4e29cfb
Make `SyncingEngine::run` use `tokio::select!`
dmitry-markin Nov 2, 2023
c0956a1
Merge remote-tracking branch 'origin/master' into dm-syncing-engine-s…
dmitry-markin Nov 2, 2023
328312a
Apply review suggestion: use `match` in `PendingResponses::poll_next`
dmitry-markin Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions substrate/client/network/sync/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ schnellru = "0.2.1"
smallvec = "1.11.0"
thiserror = "1.0"
tokio-stream = "0.1.14"
tokio = { version = "1.32.0", features = ["time", "macros"] }
fork-tree = { path = "../../../utils/fork-tree" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
sc-client-api = { path = "../../api" }
Expand Down
12 changes: 10 additions & 2 deletions substrate/client/network/sync/src/block_announce_validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.

//! `BlockAnnounceValidator` is responsible for async validation of block announcements.
//! [`BlockAnnounceValidator`] is responsible for async validation of block announcements.
//! [`Stream`] implemented by [`BlockAnnounceValidator`] never terminates.

use crate::futures_stream::FuturesStream;
use futures::{Future, FutureExt, Stream, StreamExt};
use futures::{stream::FusedStream, Future, FutureExt, Stream, StreamExt};
use libp2p::PeerId;
use log::{debug, error, trace, warn};
use sc_network_common::sync::message::BlockAnnounce;
Expand Down Expand Up @@ -300,6 +301,13 @@ impl<B: BlockT> Stream for BlockAnnounceValidator<B> {
}
}

// As [`BlockAnnounceValidator`] never terminates, we can easily implement [`FusedStream`] for it.
impl<B: BlockT> FusedStream for BlockAnnounceValidator<B> {
fn is_terminated(&self) -> bool {
false
}
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
Loading