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

Merge branch 'signer-wsnotification' into signer-ui

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-06-02 13:25:38 +02:00
commit 79a60e157b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpc/src/v1/helpers/signing_queue.rs
View File

@ -125,9 +125,13 @@ impl ConfirmationPromise {
let deadline = Instant::now() + timeout; let deadline = Instant::now() + timeout;
info!(target: "own_tx", "Signer: Awaiting transaction confirmation... ({:?}).", self.id); info!(target: "own_tx", "Signer: Awaiting transaction confirmation... ({:?}).", self.id);
while Instant::now() < deadline { loop {
// Park thread let now = Instant::now();
thread::park_timeout(timeout); if now >= deadline {
break;
}
// Park thread (may wake up spuriously)
thread::park_timeout(deadline - now);
// Take confirmation result // Take confirmation result
let res = self.result.lock().unwrap(); let res = self.result.lock().unwrap();
// Check the result // Check the result
@ -137,7 +141,7 @@ impl ConfirmationPromise {
ConfirmationResult::Waiting => continue, ConfirmationResult::Waiting => continue,
} }
} }
// We reached the timeout. Just return `None` and make sure to remove waiting. // We reached the timeout. Just return `None`
trace!(target: "own_tx", "Signer: Confirmation timeout reached... ({:?}).", self.id); trace!(target: "own_tx", "Signer: Confirmation timeout reached... ({:?}).", self.id);
None None
} }