Upgrade jsonrpc-* crates

5 files changed, 14 insertions, 13 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,
diff --git a/mullvad-rpc/Cargo.toml b/mullvad-rpc/Cargo.toml
index 239df64ccb..79bb8fa0be 100644
--- a/mullvad-rpc/Cargo.toml
+++ b/mullvad-rpc/Cargo.toml
@@ -9,8 +9,8 @@ license = "GPL-3.0"
 chrono = { version = "0.4", features = ["serde"] }
 error-chain = "0.11"
 futures = "0.1.15"
-jsonrpc-client-core = "0.2.1"
-jsonrpc-client-http = "0.2.1"
+jsonrpc-client-core = "0.3"
+jsonrpc-client-http = "0.3"
 serde_json = "1.0"
 tokio-core = "0.1"
 hyper = "0.11"
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 7f60c440bb..9f2dc1db32 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -8,8 +8,8 @@ license = "GPL-3.0"
 [dependencies]
 duct = "0.9.1"
 error-chain = "0.11"
-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-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" }
+jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" }
 lazy_static = "1.0"
 log = "0.4"
 uuid = { version = "0.5", features = ["v4"] }
diff --git a/talpid-ipc/Cargo.toml b/talpid-ipc/Cargo.toml
index 9b2cee14b6..5c2027e7d2 100644
--- a/talpid-ipc/Cargo.toml
+++ b/talpid-ipc/Cargo.toml
@@ -10,12 +10,12 @@ error-chain = "0.11"
 serde = "1.0"
 serde_json = "1.0"
 log = "0.4"
-jsonrpc-core = { 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-ws-server = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" }
 ws = { git = "https://github.com/tomusdrw/ws-rs" }
 url = "1.4"
 
 [dev-dependencies]
 assert_matches = "1.0"
 env_logger = "0.4"
-jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" }
+jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" }