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

Merge pull request #6705 from paritytech/serde-migration

Browse Source 
Removes  dependency on rustc_serialize (#5988)
This commit is contained in:
Marek Kotewicz 2017-10-11 18:17:40 +02:00 committed by GitHub
commit bfff19ca9f
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -816,7 +816,7 @@ dependencies = [
"rlp 0.2.0", "rlp 0.2.0",
"rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
"tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

7
ethcore/benches/evm.rs
View File

@ -21,8 +21,9 @@ extern crate ethcore_util as util;
extern crate rand; extern crate rand;
extern crate bn; extern crate bn;
extern crate crypto; extern crate crypto;
extern crate rustc_serialize;
extern crate ethkey; extern crate ethkey;
extern crate rustc_hex;
extern crate ethcore_bigint;
use self::test::{Bencher}; use self::test::{Bencher};
use rand::{StdRng}; use rand::{StdRng};
@ -75,9 +76,9 @@ fn sha256(b: &mut Bencher) {
#[bench] #[bench]
fn ecrecover(b: &mut Bencher) { fn ecrecover(b: &mut Bencher) {
use rustc_serialize::hex::FromHex; use rustc_hex::FromHex;
use ethkey::{Signature, recover as ec_recover}; use ethkey::{Signature, recover as ec_recover};
use util::H256; use ethcore_bigint::hash::H256;
let input = FromHex::from_hex("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad000000000000000000000000000000000000000000000000000000000000001b650acf9d3f5f0a2c799776a1254355d5f4061762a237396a99a0e0e3fc2bcd6729514a0dacb2e623ac4abd157cb18163ff942280db4d5caad66ddf941ba12e03").unwrap(); let input = FromHex::from_hex("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad000000000000000000000000000000000000000000000000000000000000001b650acf9d3f5f0a2c799776a1254355d5f4061762a237396a99a0e0e3fc2bcd6729514a0dacb2e623ac4abd157cb18163ff942280db4d5caad66ddf941ba12e03").unwrap();
let hash = H256::from_slice(&input[0..32]); let hash = H256::from_slice(&input[0..32]);
let v = H256::from_slice(&input[32..64]); let v = H256::from_slice(&input[32..64]);

2
util/network/Cargo.toml
View File

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

2
util/network/src/lib.rs
View File

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

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

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