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

Fixed depth tracking

Browse Source
This commit is contained in:
arkpar 2016-01-27 19:27:11 +01:00
parent 698fa11e76
commit 7f187674fc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/src/rlp/rlpstream.rs
View File

@ -25,6 +25,7 @@ impl ListInfo {
pub struct RlpStream { pub struct RlpStream {
unfinished_lists: ElasticArray16<ListInfo>, unfinished_lists: ElasticArray16<ListInfo>,
encoder: BasicEncoder, encoder: BasicEncoder,
finished_list: bool,
} }
impl Stream for RlpStream { impl Stream for RlpStream {
@ -32,6 +33,7 @@ impl Stream for RlpStream {
RlpStream { RlpStream {
unfinished_lists: ElasticArray16::new(), unfinished_lists: ElasticArray16::new(),
encoder: BasicEncoder::new(), encoder: BasicEncoder::new(),
finished_list: false,
} }
} }
@ -42,15 +44,16 @@ impl Stream for RlpStream {
} }
fn append<'a, E>(&'a mut self, value: &E) -> &'a mut Self where E: Encodable { fn append<'a, E>(&'a mut self, value: &E) -> &'a mut Self where E: Encodable {
let depth = self.unfinished_lists.len(); self.finished_list = false;
value.rlp_append(self); value.rlp_append(self);
if depth == self.unfinished_lists.len() { if !self.finished_list {
self.note_appended(1); self.note_appended(1);
} }
self self
} }
fn begin_list(&mut self, len: usize) -> &mut RlpStream { fn begin_list(&mut self, len: usize) -> &mut RlpStream {
self.finished_list = false;
match len { match len {
0 => { 0 => {
// we may finish, if the appended list len is equal 0 // we may finish, if the appended list len is equal 0
@ -155,6 +158,7 @@ impl RlpStream {
self.encoder.insert_list_len_at_pos(len, x.position); self.encoder.insert_list_len_at_pos(len, x.position);
self.note_appended(1); self.note_appended(1);
} }
self.finished_list = should_finish;
} }
/// Drain the object and return the underlying ElasticArray. /// Drain the object and return the underlying ElasticArray.