2016-01-12 23:44:30 +01:00
|
|
|
use common::*;
|
|
|
|
|
2016-02-03 14:51:45 +01:00
|
|
|
/// Remove the `"0x"`, if present, from the left of `s`, returning the remaining slice.
|
2016-01-12 23:44:30 +01:00
|
|
|
pub fn clean(s: &str) -> &str {
|
|
|
|
if s.len() >= 2 && &s[0..2] == "0x" {
|
|
|
|
&s[2..]
|
|
|
|
} else {
|
|
|
|
s
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-14 21:58:55 +01:00
|
|
|
fn u256_from_str(s: &str) -> U256 {
|
2016-01-14 21:24:03 +01:00
|
|
|
if s.len() >= 2 && &s[0..2] == "0x" {
|
2016-01-19 13:47:30 +01:00
|
|
|
U256::from_str(&s[2..]).unwrap_or_else(|_| U256::zero())
|
2016-01-14 21:24:03 +01:00
|
|
|
} else {
|
2016-01-19 13:47:30 +01:00
|
|
|
U256::from_dec_str(s).unwrap_or_else(|_| U256::zero())
|
2016-01-14 21:24:03 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-14 21:58:55 +01:00
|
|
|
impl FromJson for Bytes {
|
|
|
|
fn from_json(json: &Json) -> Self {
|
2016-01-19 12:14:29 +01:00
|
|
|
match *json {
|
|
|
|
Json::String(ref s) => match s.len() % 2 {
|
2016-01-19 13:47:30 +01:00
|
|
|
0 => FromHex::from_hex(clean(s)).unwrap_or_else(|_| vec![]),
|
|
|
|
_ => FromHex::from_hex(&("0".to_owned() + &(clean(s).to_owned()))[..]).unwrap_or_else(|_| vec![]),
|
2016-01-14 22:16:41 +01:00
|
|
|
},
|
|
|
|
_ => vec![],
|
2016-01-14 21:58:55 +01:00
|
|
|
}
|
2016-01-12 23:44:30 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-14 21:58:55 +01:00
|
|
|
impl FromJson for BTreeMap<H256, H256> {
|
|
|
|
fn from_json(json: &Json) -> Self {
|
2016-01-19 12:14:29 +01:00
|
|
|
match *json {
|
|
|
|
Json::Object(ref o) => o.iter().map(|(key, value)| (x!(&u256_from_str(key)), x!(&U256::from_json(value)))).collect(),
|
2016-01-14 22:16:41 +01:00
|
|
|
_ => BTreeMap::new(),
|
|
|
|
}
|
2016-01-12 23:44:30 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-14 21:24:03 +01:00
|
|
|
impl<T> FromJson for Vec<T> where T: FromJson {
|
|
|
|
fn from_json(json: &Json) -> Self {
|
2016-01-19 12:14:29 +01:00
|
|
|
match *json {
|
|
|
|
Json::Array(ref o) => o.iter().map(|x|T::from_json(x)).collect(),
|
2016-01-14 22:16:41 +01:00
|
|
|
_ => Vec::new(),
|
|
|
|
}
|
2016-01-14 21:24:03 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-14 23:39:59 +01:00
|
|
|
impl<T> FromJson for Option<T> where T: FromJson {
|
|
|
|
fn from_json(json: &Json) -> Self {
|
2016-01-19 12:14:29 +01:00
|
|
|
match *json {
|
|
|
|
Json::String(ref o) if o.is_empty() => None,
|
|
|
|
Json::Null => None,
|
2016-01-14 23:39:59 +01:00
|
|
|
_ => Some(FromJson::from_json(json)),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-14 21:24:03 +01:00
|
|
|
impl FromJson for u64 {
|
|
|
|
fn from_json(json: &Json) -> Self {
|
|
|
|
U256::from_json(json).low_u64()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl FromJson for u32 {
|
|
|
|
fn from_json(json: &Json) -> Self {
|
|
|
|
U256::from_json(json).low_u64() as u32
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl FromJson for u16 {
|
|
|
|
fn from_json(json: &Json) -> Self {
|
|
|
|
U256::from_json(json).low_u64() as u16
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn u256_from_json() {
|
|
|
|
let j = Json::from_str("{ \"dec\": \"10\", \"hex\": \"0x0a\", \"int\": 10 }").unwrap();
|
|
|
|
|
|
|
|
let v: U256 = xjson!(&j["dec"]);
|
|
|
|
assert_eq!(U256::from(10), v);
|
|
|
|
let v: U256 = xjson!(&j["hex"]);
|
|
|
|
assert_eq!(U256::from(10), v);
|
|
|
|
let v: U256 = xjson!(&j["int"]);
|
|
|
|
assert_eq!(U256::from(10), v);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2016-01-14 23:39:59 +01:00
|
|
|
fn h256_from_json() {
|
2016-01-14 21:24:03 +01:00
|
|
|
let j = Json::from_str("{ \"with\": \"0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef\", \"without\": \"0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef\" }").unwrap();
|
|
|
|
|
|
|
|
let v: H256 = xjson!(&j["with"]);
|
|
|
|
assert_eq!(H256::from_str("1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef").unwrap(), v);
|
|
|
|
let v: H256 = xjson!(&j["without"]);
|
|
|
|
assert_eq!(H256::from_str("1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef").unwrap(), v);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn vec_u256_from_json() {
|
|
|
|
let j = Json::from_str("{ \"array\": [ \"10\", \"0x0a\", 10] }").unwrap();
|
|
|
|
|
|
|
|
let v: Vec<U256> = xjson!(&j["array"]);
|
|
|
|
assert_eq!(vec![U256::from(10); 3], v);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2016-01-14 23:39:59 +01:00
|
|
|
fn vec_h256_from_json() {
|
2016-01-14 21:24:03 +01:00
|
|
|
let j = Json::from_str("{ \"array\": [ \"1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef\", \"0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef\"] }").unwrap();
|
|
|
|
|
|
|
|
let v: Vec<H256> = xjson!(&j["array"]);
|
|
|
|
assert_eq!(vec![H256::from_str("1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef").unwrap(); 2], v);
|
2016-01-12 23:44:30 +01:00
|
|
|
}
|
2016-01-14 23:39:59 +01:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn simple_types() {
|
|
|
|
let j = Json::from_str("{ \"null\": null, \"empty\": \"\", \"int\": 42, \"dec\": \"42\", \"hex\": \"0x2a\" }").unwrap();
|
|
|
|
let v: u16 = xjson!(&j["int"]);
|
|
|
|
assert_eq!(42u16, v);
|
|
|
|
let v: u32 = xjson!(&j["dec"]);
|
|
|
|
assert_eq!(42u32, v);
|
|
|
|
let v: u64 = xjson!(&j["hex"]);
|
|
|
|
assert_eq!(42u64, v);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn option_types() {
|
|
|
|
let j = Json::from_str("{ \"null\": null, \"empty\": \"\", \"int\": 42, \"dec\": \"42\", \"hex\": \"0x2a\" }").unwrap();
|
|
|
|
let v: Option<u16> = xjson!(&j["int"]);
|
|
|
|
assert_eq!(Some(42u16), v);
|
|
|
|
let v: Option<u16> = xjson!(&j["dec"]);
|
|
|
|
assert_eq!(Some(42u16), v);
|
|
|
|
let v: Option<u16> = xjson!(&j["null"]);
|
|
|
|
assert_eq!(None, v);
|
|
|
|
let v: Option<u16> = xjson!(&j["empty"]);
|
|
|
|
assert_eq!(None, v);
|
2016-01-19 12:14:29 +01:00
|
|
|
}
|