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

Merge remote-tracking branch 'origin/master' into gav

Browse Source
This commit is contained in:
Gav Wood 2016-01-14 13:11:47 +01:00
commit c1603b8286
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/json_aid.rs
View File

@ -18,12 +18,7 @@ pub fn bytes_from_json(json: &Json) -> Bytes {
} }
pub fn address_from_json(json: &Json) -> Address { pub fn address_from_json(json: &Json) -> Address {
let s = json.as_string().unwrap_or("0000000000000000000000000000000000000000"); From::from(json.as_string().unwrap_or("0000000000000000000000000000000000000000"))
if s.len() % 2 == 1 {
address_from_hex(&("0".to_string() + &(clean(s).to_string()))[..])
} else {
address_from_hex(clean(s))
}
} }
pub fn h256_from_json(json: &Json) -> H256 { pub fn h256_from_json(json: &Json) -> H256 {