Skip to content

Commit

Permalink
Update jsonrpc dependency syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyera Eulberg committed Aug 13, 2018
1 parent 792c0e9 commit 81f1850
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion src/bin/json-rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,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;
Expand Down
4 changes: 2 additions & 2 deletions src/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 81f1850

Please sign in to comment.