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

Migrating util/network from rust_serialize to serde (#5988)

Browse Source
This commit is contained in:
Dmitry Kashitsyn
2017-10-11 14:34:23 +07:00
parent dbd1976fc1
commit 504b2de4a8
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
util/network/src/node_table.rs
View File

@@ -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;