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

Merge branch 'master' into pip-msg

Browse Source
This commit is contained in:
Robert Habermeier
2017-03-22 13:14:28 +01:00
parent 7ad36ee36c b6f9cf4ba7
commit 219eddf33e
78 changed files with 611 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/src/v1/impls/light/parity.rs
View File

@@ -19,7 +19,7 @@ use std::sync::Arc;
use std::collections::{BTreeMap, HashSet};
use futures::{future, Future, BoxFuture};
use util::RotatingLogger;
use ethcore_logger::RotatingLogger;
use util::misc::version_data;
use crypto::ecies;

3
rpc/src/v1/impls/parity.rs
View File

@@ -20,7 +20,8 @@ use std::str::FromStr;
use std::collections::{BTreeMap, HashSet};
use futures::{future, Future, BoxFuture};
use util::{RotatingLogger, Address};
use ethcore_logger::RotatingLogger;
use util::Address;
use util::misc::version_data;
use crypto::ecies;