From d3c09b4e96c5d977622c9105d64b9f4a13a9962a Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <tyera@solana.com>
Date: Mon, 13 Aug 2018 13:59:04 -0600
Subject: [PATCH] Update jsonrpc dependency syntax

---
 Cargo.toml          | 5 +++--
 src/bin/json-rpc.rs | 3 ++-
 src/lib.rs          | 1 +
 src/rpc.rs          | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 894224baff..222212f82c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -79,8 +79,9 @@ futures = "0.1.21"
 generic-array = { version = "0.11.1", default-features = false, features = ["serde"] }
 getopts = "0.2"
 influx_db_client = "0.3.4"
-jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc" }
-jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc" }
+jsonrpc-core = "8.0"
+jsonrpc-http-server = "8.0"
+jsonrpc-macros = "8.0"
 itertools = "0.7.8"
 libc = "0.2.1"
 log = "0.4.2"
diff --git a/src/bin/json-rpc.rs b/src/bin/json-rpc.rs
index a98200ebf3..b62dca8c8a 100644
--- a/src/bin/json-rpc.rs
+++ b/src/bin/json-rpc.rs
@@ -4,11 +4,12 @@
 #[macro_use]
 extern crate clap;
 extern crate dirs;
+extern crate jsonrpc_core;
 extern crate jsonrpc_http_server;
 extern crate solana;
 
 use clap::{App, Arg};
-use jsonrpc_http_server::jsonrpc_core::*;
+use jsonrpc_core::*;
 use jsonrpc_http_server::*;
 use solana::crdt::NodeInfo;
 use solana::fullnode::Config;
diff --git a/src/lib.rs b/src/lib.rs
index 29512d32b4..44f706a149 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -64,6 +64,7 @@ extern crate byteorder;
 extern crate chrono;
 extern crate generic_array;
 extern crate itertools;
+extern crate jsonrpc_core;
 #[macro_use]
 extern crate jsonrpc_macros;
 extern crate jsonrpc_http_server;
diff --git a/src/rpc.rs b/src/rpc.rs
index 29b23ba346..53a3533745 100644
--- a/src/rpc.rs
+++ b/src/rpc.rs
@@ -3,7 +3,7 @@
 use bs58;
 use client::mk_client;
 use crdt::NodeInfo;
-use jsonrpc_http_server::jsonrpc_core::*;
+use jsonrpc_core::*;
 use signature::{read_keypair, KeypairUtil, Pubkey, Signature};
 use std::mem;
 
@@ -132,7 +132,7 @@ mod tests {
     use crdt::{get_ip_addr, TestNode};
     use drone::{Drone, DroneRequest};
     use fullnode::FullNode;
-    use jsonrpc_http_server::jsonrpc_core::Response;
+    use jsonrpc_core::Response;
     use ledger::LedgerWriter;
     use mint::Mint;
     use service::Service;