Merge branch 'master' into pip-msg

This commit is contained in:
Robert Habermeier
2017-03-17 14:13:10 +01:00
306 changed files with 10353 additions and 3383 deletions

View File

@@ -937,7 +937,7 @@ mod tests {
use rustc_serialize::hex::FromHex;
use super::*;
use ethkey::Secret;
use util::{U256, H256, FixedHash, Address, Hashable};
use util::{U256, H256, Address, Hashable};
use tests::helpers::*;
use devtools::*;
use env_info::EnvInfo;