Merge pull request #287 from ethcore/rpc_fixes

rpc module fixes

.travis.yml

@@ -27,6 +27,7 @@ script:
 - cargo test --release -p ethash --verbose
 - cargo test --release -p ethcore-util --verbose
 - cargo test --release -p ethcore --verbose
+- cargo test --release -p ethcore-rpc --verbose --features rpc
 - cargo test --release --verbose
 - cargo bench --no-run
 after_success: |
@@ -38,6 +39,8 @@ after_success: |
   ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethash-* &&
   cargo test --no-run -p ethcore --no-default-features &&
   ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethcore-* &&
+  cargo test --no-run -p ethcore-rpc --features rpc
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethcore_rpc-* &&
   cargo test --no-run &&
   ./kcov-master/tmp/usr/local/bin/kcov --coveralls-id=${COVERALLS_TOKEN} --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/parity-* 
   [ $TRAVIS_BRANCH = master ] &&

rpc/Cargo.toml

@@ -14,6 +14,7 @@ serde_json = "0.6.0"
 jsonrpc-core = "1.1"
 jsonrpc-http-server = "1.1"
 ethcore-util = { path = "../util" }
-ethcore = { path = ".." }
+ethcore = { path = "../ethcore" }
+ethsync = { path = "../sync" }
 clippy = "0.0.37"
 

rpc/src/lib.rs

@@ -10,6 +10,7 @@ extern crate jsonrpc_core;
 extern crate jsonrpc_http_server;
 extern crate ethcore_util as util;
 extern crate ethcore;
+extern crate ethsync;
 
 use self::jsonrpc_core::{IoHandler, IoDelegate};
 

rpc/src/v1/impls/net.rs

@@ -1,7 +1,7 @@
 //! Net rpc implementation.
 use std::sync::Arc;
 use jsonrpc_core::*;
-use ethcore::sync::EthSync;
+use ethsync::EthSync;
 use v1::traits::Net;
 
 /// Net rpc implementation.