Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Fixing serde overflow error (#1977) #2031

Merged
merged 3 commits into from
Sep 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions json/src/hash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ macro_rules! impl_hash {
0 => $inner::from(0),
2 if value == "0x" => $inner::from(0),
_ if value.starts_with("0x") => try!($inner::from_str(&value[2..]).map_err(|_| {
Error::custom(format!("Invalid hex value {}.", value).as_ref())
Error::custom(format!("Invalid hex value {}.", value))
})),
_ => try!($inner::from_str(value).map_err(|_| {
Error::custom(format!("Invalid hex value {}.", value).as_ref())
Error::custom(format!("Invalid hex value {}.", value))
}))
};

Expand Down
4 changes: 2 additions & 2 deletions json/src/uint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ impl Visitor for UintVisitor {
0 => U256::from(0),
2 if value.starts_with("0x") => U256::from(0),
_ if value.starts_with("0x") => try!(U256::from_str(&value[2..]).map_err(|_| {
Error::custom(format!("Invalid hex value {}.", value).as_ref())
Error::custom(format!("Invalid hex value {}.", value))
})),
_ => try!(U256::from_dec_str(value).map_err(|_| {
Error::custom(format!("Invalid decimal value {}.", value).as_ref())
Error::custom(format!("Invalid decimal value {}.", value))
}))
};

Expand Down
1 change: 1 addition & 0 deletions rpc/src/v1/types/trace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ pub struct VMOperation {
/// Information concerning the execution of the operation.
pub ex: Option<VMExecutedOperation>,
/// Subordinate trace of the CALL/CREATE if applicable.
#[serde(bound="VMTrace: Serialize")]
pub sub: Option<VMTrace>,
}

Expand Down