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

read_list -> as_list

Browse Source
This commit is contained in:
debris 2015-12-14 12:03:48 +01:00
parent de4a227a47
commit 9231bc6622
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/rlp/traits.rs
View File

@ -1,11 +1,10 @@
use rlp::DecoderError; use rlp::DecoderError;
pub trait Decoder { pub trait Decoder: Sized {
fn read_value<T, F>(&self, f: F) -> Result<T, DecoderError> fn read_value<T, F>(&self, f: F) -> Result<T, DecoderError>
where F: FnOnce(&[u8]) -> Result<T, DecoderError>; where F: FnOnce(&[u8]) -> Result<T, DecoderError>;
fn read_list<T, F>(&self, f: F) -> Result<T, DecoderError> fn as_list(&self) -> Result<Vec<Self>, DecoderError>;
where F: FnOnce(&[Self]) -> Result<T, DecoderError>;
} }
pub trait Decodable: Sized { pub trait Decodable: Sized {

33
src/rlp/untrusted_rlp.rs
View File

@ -305,13 +305,11 @@ impl<'a> Decoder for BasicDecoder<'a> {
} }
} }
fn read_list<T, F>(&self, f: F) -> Result<T, DecoderError> fn as_list(&self) -> Result<Vec<Self>, DecoderError> {
where F: FnOnce(&[Self]) -> Result<T, DecoderError> {
let v: Vec<BasicDecoder<'a>> = self.rlp.iter() let v: Vec<BasicDecoder<'a>> = self.rlp.iter()
.map(| i | BasicDecoder::new(i)) .map(| i | BasicDecoder::new(i))
.collect(); .collect();
f(&v) Ok(v)
} }
} }
@ -325,9 +323,8 @@ impl<T> Decodable for T where T: FromBytes {
impl<T> Decodable for Vec<T> where T: Decodable { impl<T> Decodable for Vec<T> where T: Decodable {
fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder { fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
decoder.read_list(| decoders | { let decoders = try!(decoder.as_list());
decoders.iter().map(|d| T::decode(d)).collect() decoders.iter().map(|d| T::decode(d)).collect()
})
} }
} }
@ -357,18 +354,18 @@ macro_rules! impl_array_decodable {
($index_type:ty, $len:expr ) => ( ($index_type:ty, $len:expr ) => (
impl<T> Decodable for [T; $len] where T: Decodable { impl<T> Decodable for [T; $len] where T: Decodable {
fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder { fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
decoder.read_list(| decoders | { let decoders = try!(decoder.as_list());
let mut result: [T; $len] = unsafe { ::std::mem::uninitialized() };
if decoders.len() != $len {
return Err(DecoderError::RlpIncorrectListLen);
}
for i in 0..decoders.len() {
result[i] = try!(T::decode(&decoders[i]));
}
Ok(result) let mut result: [T; $len] = unsafe { ::std::mem::uninitialized() };
}) if decoders.len() != $len {
return Err(DecoderError::RlpIncorrectListLen);
}
for i in 0..decoders.len() {
result[i] = try!(T::decode(&decoders[i]));
}
Ok(result)
} }
} }
) )