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

Updating JSON-RPC crates (#4934)

Browse Source 
* New version of jsonrpc.

* Better invalid encoding messages

* Fixing deprecated methods of tokio_core

* Using dedicated branch for jsonrpc

* Bump
This commit is contained in:
Tomasz Drwięga
2017-03-22 07:02:14 +01:00
committed by Marek Kotewicz
parent d530cc86f3
commit 7e87e9e8ad
48 changed files with 847 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
util/reactor/src/lib.rs
View File

@@ -24,7 +24,7 @@ use std::thread;
use std::sync::mpsc;
use std::time::Duration;
use futures::{Future, IntoFuture};
use self::tokio_core::reactor::{Remote as TokioRemote, Timeout};
pub use tokio_core::reactor::{Remote as TokioRemote, Timeout};
/// Event Loop for futures.
/// Wrapper around `tokio::reactor::Core`.
@@ -47,7 +47,7 @@ impl EventLoop {
let remote = rx.recv().expect("tx is transfered to a newly spawned thread.");
EventLoop {
remote: Remote{
remote: Remote {
inner: Mode::Tokio(remote),
},
handle: EventLoopHandle {
@@ -190,7 +190,7 @@ impl From<EventLoop> for EventLoopHandle {
impl Drop for EventLoopHandle {
fn drop(&mut self) {
self.close.take().map(|v| v.complete(()));
self.close.take().map(|v| v.send(()));
}
}
@@ -203,7 +203,8 @@ impl EventLoopHandle {
/// Finishes this event loop.
pub fn close(mut self) {
self.close.take()
.expect("Close is taken only in `close` and `drop`. `close` is consuming; qed").complete(())
let _ = self.close.take()
.expect("Close is taken only in `close` and `drop`. `close` is consuming; qed")
.send(());
}
}