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

Merge branch 'master' of https://github.com/gavofyork/ethcore-util into at

Browse Source
This commit is contained in:
debris 2015-12-01 20:35:13 +01:00
commit 630ab57041
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nibbleslice.rs
View File

@ -126,7 +126,10 @@ impl<'a> PartialOrd for NibbleSlice<'a> {
impl<'a> fmt::Debug for NibbleSlice<'a> { impl<'a> fmt::Debug for NibbleSlice<'a> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
for i in 0..self.len() { for i in 0..self.len() {
try!(write!(f, "{:01x}", self.at(i))); match i {
0 => try!(write!(f, "{:01x}", self.at(i))),
_ => try!(write!(f, "'{:01x}", self.at(i))),
}
} }
Ok(()) Ok(())
} }

36
src/trie.rs
View File

@ -287,10 +287,25 @@ impl TrieDB {
r r
} }
fn compose_stub_branch(value: &[u8]) -> Bytes {
let mut s = RlpStream::new_list(17);
for _ in 0..16 { s.append_empty_data(); }
s.append(&value);
s.out()
}
fn compose_extension(partial: &NibbleSlice, raw_payload: &[u8]) -> Bytes { fn compose_extension(partial: &NibbleSlice, raw_payload: &[u8]) -> Bytes {
Self::compose_raw(partial, raw_payload, false) Self::compose_raw(partial, raw_payload, false)
} }
fn create_extension(partial: &NibbleSlice, downstream_node: Bytes, diff: &mut Diff) -> Bytes {
trace!("create_extension partial: {:?}, downstream_node: {:?}", partial, downstream_node.pretty());
let mut s = RlpStream::new_list(2);
s.append(&partial.encoded(false));
diff.new_node(downstream_node, &mut s);
s.out()
}
/// Return the bytes encoding the node represented by `rlp`. It will be unlinked from /// Return the bytes encoding the node represented by `rlp`. It will be unlinked from
/// the trie. /// the trie.
fn take_node<'a, 'rlp_view>(&'a self, rlp: &'rlp_view Rlp<'a>, diff: &mut Diff) -> &'a [u8] where 'a: 'rlp_view { fn take_node<'a, 'rlp_view>(&'a self, rlp: &'rlp_view Rlp<'a>, diff: &mut Diff) -> &'a [u8] where 'a: 'rlp_view {
@ -423,13 +438,14 @@ impl TrieDB {
(_, cp) if cp == existing_key.len() => { (_, cp) if cp == existing_key.len() => {
trace!("complete-prefix (cp={:?}): AUGMENT-AT-END", cp); trace!("complete-prefix (cp={:?}): AUGMENT-AT-END", cp);
// fully-shared prefix for this extension: // fully-shared prefix for this extension:
// skip to the end of this extension and continue to augment there. // transform to an extension + augmented version of onward node.
let n = if is_leaf { old_rlp.at(1).raw() } else { self.take_node(&old_rlp.at(1), diff) }; let downstream_node: Bytes = if is_leaf {
let downstream_node = self.augmented(n, &partial.mid(cp), value, diff); // no onward node because we're a leaf - create fake stub and use that.
let mut s = RlpStream::new_list(2); self.augmented(&Self::compose_stub_branch(old_rlp.at(1).data()), &partial.mid(cp), value, diff)
s.append_raw(old_rlp.at(0).raw(), 1); } else {
diff.new_node(downstream_node, &mut s); self.augmented(self.take_node(&old_rlp.at(1), diff), &partial.mid(cp), value, diff)
s.out() };
Self::create_extension(&existing_key, downstream_node, diff)
}, },
(_, cp) => { (_, cp) => {
// partially-shared prefix for this extension: // partially-shared prefix for this extension:
@ -453,7 +469,7 @@ impl TrieDB {
}, },
} }
}, },
Prototype::Data(_) => { Prototype::Data(0) => {
trace!("empty: COMPOSE"); trace!("empty: COMPOSE");
Self::compose_leaf(partial, value) Self::compose_leaf(partial, value)
}, },
@ -579,7 +595,7 @@ mod tests {
let v: Vec<(Vec<u8>, Vec<u8>)> = vec![ let v: Vec<(Vec<u8>, Vec<u8>)> = vec![
(From::from("do"), From::from("verb")), (From::from("do"), From::from("verb")),
(From::from("dog"), From::from("puppy")), (From::from("dog"), From::from("puppy")),
// (From::from("doge"), From::from("coin")), (From::from("doge"), From::from("coin")),
// (From::from("horse"), From::from("stallion")), // (From::from("horse"), From::from("stallion")),
]; ];
@ -589,6 +605,8 @@ mod tests {
t.insert(&key, &val); t.insert(&key, &val);
} }
trace!("{:?}", t);
assert_eq!(*t.root(), trie_root(v)); assert_eq!(*t.root(), trie_root(v));
/*for i in 0..v.len() { /*for i in 0..v.len() {