Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Conversation

@expenses
Copy link
Contributor

@expenses expenses commented Dec 18, 2019

Part of #3099.

@expenses expenses changed the title Update sc-service to 0.3 futures Update the service to std futures Dec 18, 2019
@expenses expenses marked this pull request as ready for review December 19, 2019 11:35
@expenses expenses requested a review from kianenigma December 19, 2019 13:57
@expenses expenses added the A0-please_review Pull request needs code review. label Dec 21, 2019
Copy link
Contributor

@Demi-Marie Demi-Marie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@expenses expenses requested a review from tomaka January 3, 2020 15:22
@expenses
Copy link
Contributor Author

expenses commented Jan 8, 2020

cargo test -p node-cli --release --verbose --locked -- --ignored does eventually pass on my machine, so I'm not entirely sure what to do here.

@bkchr
Copy link
Member

bkchr commented Jan 9, 2020

cargo test -p node-cli --release --verbose --locked -- --ignored does eventually pass on my machine, so I'm not entirely sure what to do here.

Modify the CI script to print the messages directly.

@gavofyork
Copy link
Member

conflicts and CI failing.

@gavofyork gavofyork added A7-looksgoodcantmerge and removed A0-please_review Pull request needs code review. labels Jan 13, 2020
@expenses expenses merged commit 410ce11 into master Jan 14, 2020
@expenses expenses deleted the ashley-service-futures branch January 14, 2020 14:43
NetworkService<TBl, TNetSpec, TBl::Hash>, TExPool, TOc>
where
TBl: BlockT,
TBl: BlockT + Unpin,
Copy link
Contributor

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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)
Copy link
Contributor

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.

@tomaka
Copy link
Contributor

tomaka commented Jan 14, 2020

When you push 17 more commits after a previous review, I'd suggest to ask for a new review instead of just merging.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants