diff --git a/util/src/common.rs b/util/src/common.rs index af531656e..eff697bc2 100644 --- a/util/src/common.rs +++ b/util/src/common.rs @@ -17,7 +17,6 @@ //! Utils common types and macros global reexport. pub use standard::*; -pub use from_json::*; pub use error::*; pub use bytes::*; pub use vector::*; diff --git a/util/src/from_json.rs b/util/src/from_json.rs deleted file mode 100644 index 11e3f786d..000000000 --- a/util/src/from_json.rs +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2015-2017 Parity Technologies (UK) Ltd. -// This file is part of Parity. - -// Parity is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Parity is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Parity. If not, see . - -//! Coversion from json. - -use standard::*; -use bigint::prelude::*; - -#[macro_export] -macro_rules! xjson { - ( $x:expr ) => { - FromJson::from_json($x) - } -} - -/// Trait allowing conversion from a JSON value. -pub trait FromJson { - /// Convert a JSON value to an instance of this type. - fn from_json(json: &Json) -> Self; -} - -impl FromJson for U256 { - fn from_json(json: &Json) -> Self { - match *json { - Json::String(ref s) => { - if s.len() >= 2 && &s[0..2] == "0x" { - FromStr::from_str(&s[2..]).unwrap_or_else(|_| Default::default()) - } else { - Uint::from_dec_str(s).unwrap_or_else(|_| Default::default()) - } - }, - Json::U64(u) => From::from(u), - Json::I64(i) => From::from(i as u64), - _ => Uint::zero(), - } - } -} diff --git a/util/src/lib.rs b/util/src/lib.rs index b67154f7b..4e46dbc24 100644 --- a/util/src/lib.rs +++ b/util/src/lib.rs @@ -120,8 +120,6 @@ pub extern crate table; pub mod bloom; pub mod standard; #[macro_use] -pub mod from_json; -#[macro_use] pub mod common; pub mod error; pub mod bytes;