diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-03-06 11:37:32 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-03-06 19:13:50 +0100 |
| commit | 2ae706231d6fc09f61d2eda5fc15c5b6596dde3c (patch) | |
| tree | 7654effac298f9d83ed42bd2498cc7dd1417f861 /mullvad-daemon | |
| parent | c3e442622c17e642d8cb1c9ba6f3b604ce5120c0 (diff) | |
| download | mullvadvpn-2ae706231d6fc09f61d2eda5fc15c5b6596dde3c.tar.xz mullvadvpn-2ae706231d6fc09f61d2eda5fc15c5b6596dde3c.zip | |
Upgrade jsonrpc-* crates
Diffstat (limited to 'mullvad-daemon')
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 8 | ||||
| -rw-r--r-- | mullvad-daemon/src/management_interface.rs | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index d253d017bc..cf2531698d 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -16,10 +16,10 @@ futures = "0.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" log = "0.4" -jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" } -jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" } -jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" } -jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" } +jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } +jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } +jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } +jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } uuid = { version = "0.5", features = ["v4"] } lazy_static = "1.0" rand = "0.3" diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs index 8d6c2ebbc4..c0463f58a6 100644 --- a/mullvad-daemon/src/management_interface.rs +++ b/mullvad-daemon/src/management_interface.rs @@ -1,7 +1,7 @@ use error_chain; use error_chain::ChainedError; -use jsonrpc_core::{Error, ErrorCode, Metadata}; +use jsonrpc_core::{Error, ErrorCode, MetaIoHandler, Metadata}; use jsonrpc_core::futures::{future, sync, Future}; use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender; use jsonrpc_macros::pubsub; @@ -193,7 +193,8 @@ impl ManagementInterfaceServer { let mut io = PubSubHandler::default(); io.extend_with(rpc.to_delegate()); - let server = talpid_ipc::IpcServer::start_with_metadata(io.into(), meta_extractor)?; + let meta_io: MetaIoHandler<Meta> = io.into(); + let server = talpid_ipc::IpcServer::start_with_metadata(meta_io, meta_extractor)?; Ok(ManagementInterfaceServer { server, subscriptions, |