diff --git a/Cargo.lock b/Cargo.lock index e9d7a757a..46932e594 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -32,6 +32,7 @@ dependencies = [ "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "number_prefix 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.68 (registry+https://github.com/rust-lang/crates.io-index)", + "rlp 0.1.0", "rpassword 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 661544465..d8e42bf3a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,6 +38,7 @@ ethcore-ipc-nano = { path = "ipc/nano" } ethcore-ipc = { path = "ipc/rpc" } ethcore-ipc-hypervisor = { path = "ipc/hypervisor" } ethcore-logger = { path = "logger" } +rlp = { path = "util/rlp" } json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" } ethcore-dapps = { path = "dapps", optional = true } clippy = { version = "0.0.85", optional = true} diff --git a/parity/blockchain.rs b/parity/blockchain.rs index 06e03ae72..0dd11b976 100644 --- a/parity/blockchain.rs +++ b/parity/blockchain.rs @@ -24,7 +24,8 @@ use std::sync::Arc; use rustc_serialize::hex::FromHex; use ethcore_logger::{setup_log, Config as LogConfig}; use io::{PanicHandler, ForwardPanic}; -use util::{PayloadInfo, ToPretty}; +use util::ToPretty; +use rlp::PayloadInfo; use ethcore::service::ClientService; use ethcore::client::{Mode, DatabaseCompactionProfile, Switch, VMType, BlockImportError, BlockChainClient, BlockID}; use ethcore::error::ImportError; diff --git a/parity/main.rs b/parity/main.rs index 406645f06..86844baa9 100644 --- a/parity/main.rs +++ b/parity/main.rs @@ -26,12 +26,8 @@ extern crate docopt; extern crate num_cpus; extern crate rustc_serialize; extern crate ethcore_devtools as devtools; -#[macro_use] -extern crate ethcore_util as util; extern crate ethcore; extern crate ethsync; -#[macro_use] -extern crate log as rlog; extern crate env_logger; extern crate ethcore_logger; extern crate ctrlc; @@ -43,8 +39,8 @@ extern crate semver; extern crate ethcore_io as io; extern crate ethcore_ipc as ipc; extern crate ethcore_ipc_nano as nanoipc; -#[macro_use] -extern crate hyper; // for price_info.rs +extern crate rlp; + extern crate json_ipc_server as jsonipc; extern crate ethcore_ipc_hypervisor as hypervisor; @@ -52,11 +48,19 @@ extern crate ethcore_rpc; extern crate ethcore_signer; extern crate ansi_term; -#[macro_use] -extern crate lazy_static; + extern crate regex; extern crate isatty; +#[macro_use] +extern crate ethcore_util as util; +#[macro_use] +extern crate log as rlog; +#[macro_use] +extern crate hyper; // for price_info.rs +#[macro_use] +extern crate lazy_static; + #[cfg(feature="stratum")] extern crate ethcore_stratum;