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

lifetime of tria.at

Browse Source
This commit is contained in:
debris 2015-12-01 23:32:23 +01:00
parent 0cec68b59e
commit beaf9117d4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/trie.rs
View File

@ -17,7 +17,7 @@ pub trait Trie {
// TODO: consider returning &[u8]... // TODO: consider returning &[u8]...
fn contains(&self, key: &[u8]) -> bool; fn contains(&self, key: &[u8]) -> bool;
fn at<'a>(&'a self, key: &'a [u8]) -> Option<&'a [u8]>; fn at<'a, 'key>(&'a self, key: &'key [u8]) -> Option<&'a [u8]> where 'a: 'key;
fn insert(&mut self, key: &[u8], value: &[u8]); fn insert(&mut self, key: &[u8], value: &[u8]);
fn remove(&mut self, key: &[u8]); fn remove(&mut self, key: &[u8]);
} }
@ -214,12 +214,12 @@ impl TrieDB {
Ok(()) Ok(())
} }
fn get<'a>(&'a self, key: &NibbleSlice<'a>) -> Option<&'a [u8]> { fn get<'a, 'key>(&'a self, key: &NibbleSlice<'key>) -> Option<&'a [u8]> where 'a: 'key {
let root_rlp = self.db.lookup(&self.root).expect("Trie root not found!"); let root_rlp = self.db.lookup(&self.root).expect("Trie root not found!");
self.get_from_node(&root_rlp, key) self.get_from_node(&root_rlp, key)
} }
fn get_from_node<'a>(&'a self, node: &'a [u8], key: &NibbleSlice<'a>) -> Option<&'a [u8]> { fn get_from_node<'a, 'key>(&'a self, node: &'a [u8], key: &NibbleSlice<'key>) -> Option<&'a [u8]> where 'a: 'key {
match Node::decoded(node) { match Node::decoded(node) {
Node::Leaf(ref slice, ref value) if key == slice => Some(value), Node::Leaf(ref slice, ref value) if key == slice => Some(value),
Node::Extension(ref slice, ref item) if key.starts_with(slice) => { Node::Extension(ref slice, ref item) if key.starts_with(slice) => {
@ -469,7 +469,7 @@ impl Trie for TrieDB {
unimplemented!(); unimplemented!();
} }
fn at<'a>(&'a self, key: &'a [u8]) -> Option<&'a [u8]> { fn at<'a, 'key>(&'a self, key: &'key [u8]) -> Option<&'a [u8]> where 'a: 'key {
self.get(&NibbleSlice::new(key)) self.get(&NibbleSlice::new(key))
} }
@ -597,6 +597,9 @@ mod tests {
assert_eq!(t.at(&key).unwrap(), val); assert_eq!(t.at(&key).unwrap(), val);
} }
// check lifetime
let _q = t.at(&[b'd', b'o']).unwrap();
assert_eq!(*t.root(), trie_root(v)); assert_eq!(*t.root(), trie_root(v));
} }