This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
fetch: replace futures-timer with tokio-timer #9066
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andresilva
added
A0-pleasereview 🤓
andresilva
force-pushed
the
andre/remove-futures-timer
branch
from
ee8a082
to
977d045
Compare
niklasad1
reviewed
Jul 7, 2018
util/fetch/src/client.rs
Outdated
| @@ -142,6 +142,7 @@ type ChanItem = Option<(Request, Abort, TxResponse)>; | |||
| pub struct Client { | |||
| core: mpsc::Sender<ChanItem>, | |||
| refs: Arc<AtomicUsize>, | |||
| timer: Timer, | |||
niklasad1
reviewed
Jul 7, 2018
util/fetch/src/client.rs
Outdated
| @@ -151,6 +152,7 @@ impl Clone for Client { | |||
| Client { | |||
| core: self.core.clone(), | |||
| refs: self.refs.clone(), | |||
| timer: self.timer.clone(), | |||
niklasad1
reviewed
Jul 7, 2018
util/fetch/src/client.rs
Outdated
| @@ -193,6 +195,7 @@ impl Client { | |||
| Ok(Client { | |||
| core: tx_proto, | |||
| refs: Arc::new(AtomicUsize::new(1)), | |||
| timer: Timer::default(), | |||
niklasad1
reviewed
Jul 7, 2018
util/fetch/src/client.rs
Outdated
| Box::new(future) | ||
| .and_then(future::result); | ||
|
|
||
| Box::new(self.timer.timeout(future, maxdur)) |
niklasad1
reviewed
Jul 7, 2018
util/fetch/src/client.rs
Outdated
| @@ -575,6 +570,8 @@ pub enum Error { | |||
| Aborted, | |||
| /// Too many redirects have been encountered. | |||
| TooManyRedirects, | |||
| /// tokio-timer gave us an error. | |||
| Timer(tokio_timer::TimerError), | |||
niklasad1
reviewed
Jul 7, 2018
util/fetch/src/client.rs
Outdated
| tokio_timer::TimeoutError::TimedOut(_) => Error::Timeout, | ||
| } | ||
| } | ||
| } |
niklasad1
approved these changes
Jul 7, 2018
util/fetch/src/client.rs
Outdated
| @@ -750,7 +757,10 @@ mod test { | |||
| } | |||
| "/delay" => { | |||
| let d = Duration::from_secs(req.uri().query().unwrap_or("0").parse().unwrap()); | |||
| Box::new(Delay::new(d).from_err().map(|_| Response::new())) | |||
| Box::new(self.0.sleep(d) | |||
| .map_err(|_| return io::Error::new(io::ErrorKind::Other, "timer error")) | |||
|
Yeah I had editorconfig disabled because I was having some issues with magit. I will reformat everything and squash. |
niklasad1
added
A6-mustntgrumble 💦
Currently the coverage build fails because `futures-timer` fails to compile with `-C link-dead-code`. This issue has been reported to `futures-timer` (async-rs/futures-timer#2) but has remained unsolved for months. It should be fixed by rustc eventually (rust-lang/rust#45629).
andresilva
force-pushed
the
andre/remove-futures-timer
branch
from
977d045
to
6c25589
Compare
andresilva
added
A0-pleasereview 🤓
andresilva
force-pushed
the
andre/remove-futures-timer
branch
from
3850a34
to
b464bd1
Compare
|
Successful coverage build: https://gitlab.parity.io/parity/parity/-/jobs/91344 |
andresilva
added a commit
that referenced
this pull request
Jul 8, 2018
|
Amazing! |
|
Better coverage report that doesn't include the |
andresilva
force-pushed
the
andre/remove-futures-timer
branch
from
71ee31d
to
f335830
Compare
dvdplm
added a commit
that referenced
this pull request
Jul 9, 2018
* master: fetch: replace futures-timer with tokio-timer (#9066)
ordian
added a commit
to ordian/parity
that referenced
this pull request
Jul 9, 2018
…rp_sync_on_light_client * 'master' of https://github.com/paritytech/parity: docs: add changelog for 1.10.9 stable and 1.11.6 beta (openethereum#9069) Enable test in `miner/pool/test` (openethereum#9072) fetch: replace futures-timer with tokio-timer (openethereum#9066) remove util-error (openethereum#9054)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently the coverage build fails because
futures-timerfails to compile with-C link-dead-code(https://gitlab.parity.io/parity/parity/-/jobs/91245). This issue has been reported tofutures-timer(async-rs/futures-timer#2) but has remained unsolved for months. It should be fixed by rustc eventually (rust-lang/rust#45629).