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

generalized fixedsized structs with macro

Browse Source
This commit is contained in:
Nikolay Volf 2016-04-17 18:52:44 +03:00
parent 17f26ad588
commit 3138584320
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethcore/src/client/ids.rs
View File

@ -18,6 +18,7 @@
use util::hash::H256; use util::hash::H256;
use header::BlockNumber; use header::BlockNumber;
use util::bytes::{FromRawBytes, FromBytesError, ToBytesWithMap, Populatable};
/// Uniquely identifies block. /// Uniquely identifies block.
#[derive(Debug, PartialEq, Clone, Hash, Eq)] #[derive(Debug, PartialEq, Clone, Hash, Eq)]
@ -50,3 +51,7 @@ pub struct UncleId (
/// Position in block. /// Position in block.
pub usize pub usize
); );
sized_binary_map!(TransactionId);
sized_binary_map!(UncleId);
sized_binary_map!(BlockId);

67
util/src/bytes.rs
View File

@ -265,19 +265,42 @@ impl<T> FromRawBytes for T where T: FixedHash {
} }
} }
impl FromRawBytes for u16 { #[macro_export]
macro_rules! sized_binary_map {
($target_ty: ident) => {
impl FromRawBytes for $target_ty {
fn from_bytes(bytes: &[u8]) -> Result<Self, FromBytesError> { fn from_bytes(bytes: &[u8]) -> Result<Self, FromBytesError> {
match bytes.len().cmp(&2) { match bytes.len().cmp(&::std::mem::size_of::<$target_ty>()) {
Ordering::Less => return Err(FromBytesError::NotLongEnough), ::std::cmp::Ordering::Less => return Err(FromBytesError::NotLongEnough),
Ordering::Greater => return Err(FromBytesError::TooLong), ::std::cmp::Ordering::Greater => return Err(FromBytesError::TooLong),
Ordering::Equal => () ::std::cmp::Ordering::Equal => ()
}; };
let mut res: Self = unsafe { mem::uninitialized() }; let mut res: Self = unsafe { ::std::mem::uninitialized() };
res.copy_raw(bytes); res.copy_raw(bytes);
Ok(res) Ok(res)
} }
}
impl ToBytesWithMap for $target_ty {
fn to_bytes_map(&self) -> Vec<u8> {
let sz = ::std::mem::size_of::<$target_ty>();
let mut res = Vec::<u8>::with_capacity(sz);
let ip: *const $target_ty = self;
let ptr: *const u8 = ip as *const _;
unsafe {
res.set_len(sz);
::std::ptr::copy(ptr, res.as_mut_ptr(), sz);
}
res
}
}
}
} }
sized_binary_map!(u16);
sized_binary_map!(u32);
sized_binary_map!(u64);
/// Value that can be serialized from variable-length byte array /// Value that can be serialized from variable-length byte array
pub trait FromRawBytesVariable : Sized { pub trait FromRawBytesVariable : Sized {
/// Create value from slice /// Create value from slice
@ -406,7 +429,9 @@ impl FromRawBytesVariable for Vec<u8> {
} }
} }
/// Value that serializes directly to variable-sized byte array and stores map
pub trait ToBytesWithMap { pub trait ToBytesWithMap {
/// serialize to variable-sized byte array and store map
fn to_bytes_map(&self) -> Vec<u8>; fn to_bytes_map(&self) -> Vec<u8>;
} }
@ -416,36 +441,6 @@ impl<T> ToBytesWithMap for T where T: FixedHash {
} }
} }
impl ToBytesWithMap for u16 {
fn to_bytes_map(&self) -> Vec<u8> {
let sz = mem::size_of::<u16>();
let mut res = Vec::<u8>::with_capacity(sz);
let ip: *const u16 = self;
let ptr: *const u8 = ip as *const _;
unsafe {
res.set_len(sz);
::std::ptr::copy(ptr, res.as_mut_ptr(), sz);
}
res
}
}
impl ToBytesWithMap for u64 {
fn to_bytes_map(&self) -> Vec<u8> {
let sz = mem::size_of::<u64>();
let mut res = Vec::<u8>::with_capacity(sz);
let ip: *const u64 = self;
let ptr: *const u8 = ip as *const _;
unsafe {
res.set_len(sz);
::std::ptr::copy(ptr, res.as_mut_ptr(), sz);
}
res
}
}
#[test] #[test]
fn fax_raw() { fn fax_raw() {
let mut x = [255u8; 4]; let mut x = [255u8; 4];