grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #287 from ethcore/rpc_fixes

Browse Source 
rpc module fixes
This commit is contained in:
Marek Kotewicz 2016-02-01 12:56:30 +01:00
commit fd1729a82a
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

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

3
rpc/Cargo.toml
View File

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

1
rpc/src/lib.rs
View File

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

2
rpc/src/v1/impls/net.rs
View File

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