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

RlpStream uses BasicEncoder

Browse Source
This commit is contained in:
debris 2015-11-25 22:29:21 +01:00
parent 1c2c8c4eb5
commit 20cadef4f0
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/rlp.rs
View File

@ -193,7 +193,7 @@ impl <'a> Iterator for RlpIterator<'a> {
pub struct RlpStream { pub struct RlpStream {
len: usize, len: usize,
max_len: usize, max_len: usize,
bytes: Vec<u8> encoder: BasicEncoder
} }
impl RlpStream { impl RlpStream {
@ -208,14 +208,14 @@ impl RlpStream {
RlpStream { RlpStream {
len: 0, len: 0,
max_len: max_len, max_len: max_len,
bytes: vec![] encoder: BasicEncoder::new()
} }
} }
/// apends value to the end of stream, chainable /// apends value to the end of stream, chainable
pub fn append<'a, E>(&'a mut self, object: &E) -> &'a mut RlpStream where E: Encodable { pub fn append<'a, E>(&'a mut self, object: &E) -> &'a mut RlpStream where E: Encodable {
// encode given value and add it at the end of the stream // encode given value and add it at the end of the stream
self.bytes.extend(encode(object)); object.encode(&mut self.encoder);
self.len += 1; self.len += 1;
// if list is finished, prepend the length // if list is finished, prepend the length
@ -235,30 +235,20 @@ impl RlpStream {
/// streams out encoded bytes /// streams out encoded bytes
pub fn out(self) -> Result<Vec<u8>, EncoderError> { pub fn out(self) -> Result<Vec<u8>, EncoderError> {
match self.is_finished() { match self.is_finished() {
true => Ok(self.bytes), true => Ok(self.encoder.out()),
false => Err(EncoderError::StreamIsUnfinished) false => Err(EncoderError::StreamIsUnfinished)
} }
} }
/// prepend the length of the bytes to the beginning of the vector /// prepend the length of the bytes to the beginning of the vector
fn prepend_the_length(&mut self) -> () { fn prepend_the_length(&mut self) -> () {
let mut v = match self.bytes.len() { let len = self.encoder.bytes.len();
len @ 0...55 => vec![0xc0u8 + len as u8], self.encoder.insert_list_len_at_pos(len, 0);
len => {
let mut res = vec![0x7fu8 + len.to_bytes_len() as u8];
let mut b = len.to_bytes();
res.append(&mut b);
res
}
};
v.append(&mut self.bytes);
self.bytes = v;
} }
} }
/// shortcut function to encode a `T: Encodable` into a Rlp `Vec<u8>` /// shortcut function to encode a `T: Encodable` into a Rlp `Vec<u8>`
fn encode<E>(object: &E) -> Vec<u8> where E: Encodable { pub fn encode<E>(object: &E) -> Vec<u8> where E: Encodable {
let mut encoder = BasicEncoder::new(); let mut encoder = BasicEncoder::new();
object.encode(&mut encoder); object.encode(&mut encoder);
encoder.out() encoder.out()