Merge branch 'fo-6418-dont-export-bigint' of github.com:paritytech/parity into util_error_chain

This commit is contained in:
debris
2017-09-05 11:15:39 +02:00
286 changed files with 655 additions and 327 deletions

View File

@@ -25,7 +25,7 @@ use std::path::{PathBuf};
use std::fmt;
use std::fs;
use std::io::{Read, Write};
use util::hash::*;
use bigint::hash::*;
use rlp::*;
use time::Tm;
use error::NetworkError;
@@ -372,7 +372,7 @@ pub fn is_valid_node_url(url: &str) -> bool {
mod tests {
use super::*;
use std::net::{SocketAddr, SocketAddrV4, Ipv4Addr};
use util::H512;
use bigint::hash::H512;
use std::str::FromStr;
use devtools::*;
use ipnetwork::IpNetwork;