grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix some warns on nightly (#8889)

Browse Source
This commit is contained in:
Niklas Adolfsson 2018-06-14 10:58:46 +02:00 committed by Marek Kotewicz
parent da95f77996
commit 9e872788c7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ethcore/src/engines/authority_round/mod.rs
View File

@ -715,7 +715,7 @@ const ENGINE_TIMEOUT_TOKEN: TimerToken = 23;
impl IoHandler<()> for TransitionHandler { impl IoHandler<()> for TransitionHandler {
fn initialize(&self, io: &IoContext<()>) { fn initialize(&self, io: &IoContext<()>) {
let remaining = self.step.inner.duration_remaining().as_millis(); let remaining = AsMillis::as_millis(&self.step.inner.duration_remaining());
io.register_timer_once(ENGINE_TIMEOUT_TOKEN, Duration::from_millis(remaining)) io.register_timer_once(ENGINE_TIMEOUT_TOKEN, Duration::from_millis(remaining))
.unwrap_or_else(|e| warn!(target: "engine", "Failed to start consensus step timer: {}.", e)) .unwrap_or_else(|e| warn!(target: "engine", "Failed to start consensus step timer: {}.", e))
} }
@ -725,7 +725,7 @@ impl IoHandler<()> for TransitionHandler {
// NOTE we might be lagging by couple of steps in case the timeout // NOTE we might be lagging by couple of steps in case the timeout
// has not been called fast enough. // has not been called fast enough.
// Make sure to advance up to the actual step. // Make sure to advance up to the actual step.
while self.step.inner.duration_remaining().as_millis() == 0 { while AsMillis::as_millis(&self.step.inner.duration_remaining()) == 0 {
self.step.inner.increment(); self.step.inner.increment();
self.step.can_propose.store(true, AtomicOrdering::SeqCst); self.step.can_propose.store(true, AtomicOrdering::SeqCst);
if let Some(ref weak) = *self.client.read() { if let Some(ref weak) = *self.client.read() {
@ -735,7 +735,7 @@ impl IoHandler<()> for TransitionHandler {
} }
} }
let next_run_at = self.step.inner.duration_remaining().as_millis() >> 2; let next_run_at = AsMillis::as_millis(&self.step.inner.duration_remaining()) >> 2;
io.register_timer_once(ENGINE_TIMEOUT_TOKEN, Duration::from_millis(next_run_at)) io.register_timer_once(ENGINE_TIMEOUT_TOKEN, Duration::from_millis(next_run_at))
.unwrap_or_else(|e| warn!(target: "engine", "Failed to restart consensus step timer: {}.", e)) .unwrap_or_else(|e| warn!(target: "engine", "Failed to restart consensus step timer: {}.", e))
} }