-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Update the service to std futures #4447
Conversation
sc-service to 0.3 futures
Demi-Marie
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good
|
|
Modify the CI script to print the messages directly. |
|
conflicts and CI failing. |
This reverts commit 9c19763.
| NetworkService<TBl, TNetSpec, TBl::Hash>, TExPool, TOc> | ||
| where | ||
| TBl: BlockT, | ||
| TBl: BlockT + Unpin, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is wrong.
| } | ||
|
|
||
| impl<TBl, TCl, TSc, TNetStatus, TNet, TTxPool, TOc> Future for | ||
| impl<TBl: Unpin, TCl, TSc: Unpin, TNetStatus, TNet, TTxPool, TOc> Future for |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| impl<TBl: Unpin, TCl, TSc: Unpin, TNetStatus, TNet, TTxPool, TOc> Future for | |
| impl<TBl, TCl, TSc, TNetStatus, TNet, TTxPool, TOc> Future for |
| TExec: 'static + sc_client::CallExecutor<TBl> + Send + Sync + Clone, | ||
| TRtApi: 'static + Send + Sync, | ||
| TSc: sp_consensus::SelectChain<TBl> + 'static + Clone + Send, | ||
| TSc: sp_consensus::SelectChain<TBl> + 'static + Clone + Send + Unpin, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| TSc: sp_consensus::SelectChain<TBl> + 'static + Clone + Send + Unpin, | |
| TSc: sp_consensus::SelectChain<TBl> + 'static + Clone + Send, |
|
|
||
| while let Ok(Async::Ready(Some(task_to_spawn))) = self.to_spawn_rx.poll() { | ||
| while let Poll::Ready(Some(task_to_spawn)) = Pin::new(&mut this.to_spawn_rx).poll_next(cx) { | ||
| // TODO: Update to tokio 0.2 when libp2p get switched to std futures (#4383) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Libp2p has been switched to std futures.
|
When you push 17 more commits after a previous review, I'd suggest to ask for a new review instead of just merging. |
Part of #3099.