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

emit_value && emit_array do not have constrains regarding type

Browse Source
This commit is contained in:
debris 2015-11-25 21:14:53 +01:00
parent c5163b796f
commit c47bf0ce5f
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/rlp.rs
View File

@ -309,19 +309,26 @@ pub trait Encodable {
pub trait Encoder { pub trait Encoder {
type Error; type Error;
fn emit_value<V>(&mut self, value: &V) -> Result<(), Self::Error> where V: Encodable + ToBytes; fn emit_value(&mut self, bytes: &[u8]) -> Result<(), Self::Error>;
fn emit_array<V>(&mut self, array: &[V]) -> Result<(), Self::Error> where V: Encodable; fn emit_array<F>(&mut self, f: F) -> Result<(), Self::Error> where
F: FnOnce(&mut Self) -> Result<(), Self::Error>;
} }
impl <T> Encodable for T where T: ToBytes { impl <T> Encodable for T where T: ToBytes {
fn encode<E>(&self, encoder: &mut E) -> Result<(), E::Error> where E: Encoder { fn encode<E>(&self, encoder: &mut E) -> Result<(), E::Error> where E: Encoder {
encoder.emit_value(self) encoder.emit_value(&self.to_bytes())
} }
} }
impl <'a, T> Encodable for &'a [T] where T: Encodable + 'a { impl <'a, T> Encodable for &'a [T] where T: Encodable + 'a {
fn encode<E>(&self, encoder: &mut E) -> Result<(), E::Error> where E: Encoder { fn encode<E>(&self, encoder: &mut E) -> Result<(), E::Error> where E: Encoder {
encoder.emit_array(self) encoder.emit_array(|e| {
// insert all array elements
for el in self.iter() {
try!(el.encode(e));
}
Ok(())
})
} }
} }
@ -372,10 +379,7 @@ impl BasicEncoder {
impl Encoder for BasicEncoder { impl Encoder for BasicEncoder {
type Error = EncoderError; type Error = EncoderError;
fn emit_value<V>(&mut self, value: &V) -> Result<(), Self::Error> where V: Encodable + ToBytes { fn emit_value(&mut self, bytes: &[u8]) -> Result<(), Self::Error> {
let v = value.to_bytes();
let bytes: &[u8] = v.as_ref();
match bytes.len() { match bytes.len() {
// just 0 // just 0
0 => { try!(self.bytes.write(&[0x80u8])); }, 0 => { try!(self.bytes.write(&[0x80u8])); },
@ -396,15 +400,14 @@ impl Encoder for BasicEncoder {
Ok(()) Ok(())
} }
fn emit_array<V>(&mut self, array: &[V]) -> Result<(), Self::Error> where V: Encodable { fn emit_array<F>(&mut self, f: F) -> Result<(), Self::Error> where
F: FnOnce(&mut Self) -> Result<(), Self::Error> {
// get len before inserting an array // get len before inserting an array
let before_len = self.bytes.len(); let before_len = self.bytes.len();
// insert all array elements // insert all array elements
for el in array.iter() { try!(f(self));
try!(el.encode(self));
}
// get len after inserting an array // get len after inserting an array
let after_len = self.bytes.len(); let after_len = self.bytes.len();