poanetwork
/
parity-common
mirror of https://github.com/poanetwork/parity-common.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #24 from paritytech/td-fix-uint 

Fix missing serde impls for uints.
This commit is contained in:
Marek Kotewicz 2018-03-09 14:22:42 +01:00 committed by GitHub
parent f66e0ce2a6 1f9a36c78b
commit 37be381eb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 96 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
ethereum-types/src/hash.rs
View File

@ -6,47 +6,24 @@ use serde::{Serialize, Serializer, Deserialize, Deserializer};
#[cfg(feature="serialize")] #[cfg(feature="serialize")]
use ethereum_types_serialize; use ethereum_types_serialize;
construct_hash!(H32, 4); macro_rules! impl_serde {
construct_hash!(H64, 8); ($name: ident, $len: expr) => {
construct_hash!(H128, 16); #[cfg(feature="serialize")]
construct_hash!(H160, 20); impl Serialize for $name {
construct_hash!(H256, 32); fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
construct_hash!(H264, 33); let mut slice = [0u8; 2 + 2 * $len];
construct_hash!(H512, 64); ethereum_types_serialize::serialize(&mut slice, &self.0, serializer)
construct_hash!(H520, 65); }
construct_hash!(H1024, 128); }
#[deprecated] #[cfg(feature="serialize")]
impl From<H256> for H160 { impl<'de> Deserialize<'de> for $name {
fn from(value: H256) -> H160 { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let mut ret = H160::new(); let mut bytes = [0u8; $len];
ret.0.copy_from_slice(&value[12..32]); ethereum_types_serialize::deserialize_check_len(deserializer, ethereum_types_serialize::ExpectedLen::Exact(&mut bytes))?;
ret Ok($name(bytes))
} }
} }
#[deprecated]
impl From<H256> for H64 {
fn from(value: H256) -> H64 {
let mut ret = H64::new();
ret.0.copy_from_slice(&value[20..28]);
ret
}
}
impl From<H160> for H256 {
fn from(value: H160) -> H256 {
let mut ret = H256::new();
ret.0[12..32].copy_from_slice(&value);
ret
}
}
impl<'a> From<&'a H160> for H256 {
fn from(value: &'a H160) -> H256 {
let mut ret = H256::new();
ret.0[12..32].copy_from_slice(value);
ret
} }
} }
@ -82,33 +59,6 @@ macro_rules! impl_uint_conversions {
} }
} }
impl_uint_conversions!(H64, U64);
impl_uint_conversions!(H128, U128);
impl_uint_conversions!(H256, U256);
impl_uint_conversions!(H512, U512);
impl_uint_conversions!(H1024, U1024);
macro_rules! impl_serde {
($name: ident, $len: expr) => {
#[cfg(feature="serialize")]
impl Serialize for $name {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
let mut slice = [0u8; 2 + 2 * $len];
ethereum_types_serialize::serialize(&mut slice, &self.0, serializer)
}
}
#[cfg(feature="serialize")]
impl<'de> Deserialize<'de> for $name {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let mut bytes = [0u8; $len];
ethereum_types_serialize::deserialize_check_len(deserializer, ethereum_types_serialize::ExpectedLen::Exact(&mut bytes))?;
Ok($name(bytes))
}
}
}
}
impl_serde!(H32, 4); impl_serde!(H32, 4);
impl_serde!(H64, 8); impl_serde!(H64, 8);
impl_serde!(H128, 16); impl_serde!(H128, 16);
@ -118,3 +68,53 @@ impl_serde!(H264, 33);
impl_serde!(H512, 64); impl_serde!(H512, 64);
impl_serde!(H520, 65); impl_serde!(H520, 65);
impl_serde!(H1024, 128); impl_serde!(H1024, 128);
construct_hash!(H32, 4);
construct_hash!(H64, 8);
construct_hash!(H128, 16);
construct_hash!(H160, 20);
construct_hash!(H256, 32);
construct_hash!(H264, 33);
construct_hash!(H512, 64);
construct_hash!(H520, 65);
construct_hash!(H1024, 128);
impl_uint_conversions!(H64, U64);
impl_uint_conversions!(H128, U128);
impl_uint_conversions!(H256, U256);
impl_uint_conversions!(H512, U512);
impl_uint_conversions!(H1024, U1024);
#[deprecated]
impl From<H256> for H160 {
fn from(value: H256) -> H160 {
let mut ret = H160::new();
ret.0.copy_from_slice(&value[12..32]);
ret
}
}
#[deprecated]
impl From<H256> for H64 {
fn from(value: H256) -> H64 {
let mut ret = H64::new();
ret.0.copy_from_slice(&value[20..28]);
ret
}
}
impl From<H160> for H256 {
fn from(value: H160) -> H256 {
let mut ret = H256::new();
ret.0[12..32].copy_from_slice(&value);
ret
}
}
impl<'a> From<&'a H160> for H256 {
fn from(value: &'a H160) -> H256 {
let mut ret = H256::new();
ret.0[12..32].copy_from_slice(value);
ret
}
}

56
ethereum-types/src/uint.rs
View File

@ -4,12 +4,41 @@ use serde::{Serialize, Serializer, Deserialize, Deserializer};
#[cfg(feature="serialize")] #[cfg(feature="serialize")]
use ethereum_types_serialize; use ethereum_types_serialize;
macro_rules! impl_serde {
($name: ident, $len: expr) => {
#[cfg(feature="serialize")]
impl Serialize for $name {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
let mut slice = [0u8; 2 + 2 * $len * 8];
let mut bytes = [0u8; $len * 8];
self.to_big_endian(&mut bytes);
ethereum_types_serialize::serialize_uint(&mut slice, &bytes, serializer)
}
}
#[cfg(feature="serialize")]
impl<'de> Deserialize<'de> for $name {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let mut bytes = [0u8; $len * 8];
let wrote = ethereum_types_serialize::deserialize_check_len(deserializer, ethereum_types_serialize::ExpectedLen::Between(0, &mut bytes))?;
Ok(bytes[0..wrote].into())
}
}
}
}
construct_uint!(U64, 1); construct_uint!(U64, 1);
construct_uint!(U128, 2); construct_uint!(U128, 2);
construct_uint!(U256, 4); construct_uint!(U256, 4);
construct_uint!(U512, 8); construct_uint!(U512, 8);
construct_uint!(U1024, 16); construct_uint!(U1024, 16);
impl_serde!(U64, 1);
impl_serde!(U128, 2);
impl_serde!(U256, 4);
impl_serde!(U512, 8);
impl_serde!(U1024, 16);
impl U256 { impl U256 {
/// Multiplies two 256-bit integers to produce full 512-bit integer /// Multiplies two 256-bit integers to produce full 512-bit integer
/// No overflow possible /// No overflow possible
@ -330,30 +359,3 @@ impl From<U512> for [u8; 64] {
arr arr
} }
} }
macro_rules! impl_serde {
($name: ident, $len: expr) => {
#[cfg(feature="serialize")]
impl Serialize for $name {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
let mut slice = [0u8; 2 + 2 * $len * 8];
let mut bytes = [0u8; $len * 8];
self.to_big_endian(&mut bytes);
ethereum_types_serialize::serialize_uint(&mut slice, &bytes, serializer)
}
}
#[cfg(feature="serialize")]
impl<'de> Deserialize<'de> for $name {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let mut bytes = [0u8; $len * 8];
let wrote = ethereum_types_serialize::deserialize_check_len(deserializer, ethereum_types_serialize::ExpectedLen::Between(0, &mut bytes))?;
Ok(bytes[0..wrote].into())
}
}
}
}
impl_serde!(U128, 2);
impl_serde!(U256, 4);
impl_serde!(U512, 8);