Merge pull request #6705 from paritytech/serde-migration

Removes  dependency on rustc_serialize (#5988)

util/network/Cargo.toml

@@ -21,7 +21,6 @@ libc = "0.2.7"
 parking_lot = "0.4"
 ansi_term = "0.9"
 rustc-hex = "1.0"
-rustc-serialize = "0.3"
 ethcore-io = { path = "../io" }
 ethcore-util = { path = ".." }
 ethcore-bigint = { path = "../bigint" }
@@ -34,6 +33,7 @@ path = { path = "../path" }
 ethcore-logger = { path ="../../logger" }
 ipnetwork = "0.12.6"
 hash = { path = "../hash" }
+serde_json = "1.0"
 
 [features]
 default = []

util/network/src/lib.rs

@@ -69,7 +69,6 @@ extern crate rand;
 extern crate time;
 extern crate ansi_term; //TODO: remove this
 extern crate rustc_hex;
-extern crate rustc_serialize;
 extern crate igd;
 extern crate libc;
 extern crate slab;
@@ -81,6 +80,7 @@ extern crate path;
 extern crate ethcore_logger;
 extern crate ipnetwork;
 extern crate hash;
+extern crate serde_json;
 
 #[macro_use]
 extern crate log;

util/network/src/node_table.rs

@@ -32,7 +32,7 @@ use error::NetworkError;
 use {AllowIP, IpFilter};
 use discovery::{TableUpdates, NodeEntry};
 use ip_utils::*;
-pub use rustc_serialize::json::Json;
+use serde_json::Value;
 
 /// Node public key
 pub type NodeId = H512;
@@ -332,7 +332,7 @@ impl NodeTable {
 					return nodes;
 				}
 			}
-			let json = match Json::from_str(&buf) {
+			let json: Value = match ::serde_json::from_str(&buf) {
 				Ok(json) => json,
 				Err(e) => {
 					warn!("Error parsing node table file: {:?}", e);
@@ -341,7 +341,7 @@ impl NodeTable {
 			};
 			if let Some(list) = json.as_object().and_then(|o| o.get("nodes")).and_then(|n| n.as_array()) {
 				for n in list.iter().filter_map(|n| n.as_object()) {
-					if let Some(url) = n.get("url").and_then(|u| u.as_string()) {
+					if let Some(url) = n.get("url").and_then(|u| u.as_str()) {
 						if let Ok(mut node) = Node::from_str(url) {
 							if let Some(failures) = n.get("failures").and_then(|f| f.as_u64()) {
 								node.failures = failures as u32;