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

First insert in trie works!

Browse Source
This commit is contained in:
Gav Wood 2015-11-30 14:53:22 +01:00
parent 7fd6252772
commit 972b78d47b
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/trie.rs
View File

@ -50,14 +50,15 @@ impl TrieDB {
pub fn db(&self) -> &HashDB { self.db.as_ref() } pub fn db(&self) -> &HashDB { self.db.as_ref() }
fn set_root_rlp(&mut self, root_data: &[u8]) { fn set_root_rlp(&mut self, root_data: &[u8]) {
self.db.kill(&self.root);
self.root = self.db.insert(root_data); self.root = self.db.insert(root_data);
println!("set_root_rlp {:?} {:?}", root_data, self.root);
} }
fn add(&mut self, key: &NibbleSlice, value: &[u8]) { fn add(&mut self, key: &NibbleSlice, value: &[u8]) {
// determine what the new root is, insert new nodes and remove old as necessary. // determine what the new root is, insert new nodes and remove old as necessary.
let todo = let todo = {
{ let root_rlp = self.db.lookup(&self.root).expect("Trie root not found!");
let root_rlp = self.db.lookup(&self.root).unwrap();
self.merge(root_rlp, key, value) self.merge(root_rlp, key, value)
}; };
self.apply(todo.1); self.apply(todo.1);
@ -90,17 +91,22 @@ impl TrieDB {
// already have an extension. either fast_forward, cleve or transmute_to_branch. // already have an extension. either fast_forward, cleve or transmute_to_branch.
unimplemented!(); unimplemented!();
}, },
Prototype::Data(0) => (Self::compose_extension(partial_key, value, true), Diff::new()), Prototype::Data(0) => {
(Self::compose_extension(partial_key, value, true), Diff::new())
},
_ => panic!("Invalid RLP for node."), _ => panic!("Invalid RLP for node."),
} }
} }
fn compose_extension(partial_key: &NibbleSlice, value: &[u8], is_leaf: bool) -> Bytes { fn compose_extension(partial_key: &NibbleSlice, value: &[u8], is_leaf: bool) -> Bytes {
println!("compose_extension {:?} {:?} {:?} ({:?})", partial_key, value, is_leaf, partial_key.encoded(is_leaf));
let mut s = RlpStream::new_list(2); let mut s = RlpStream::new_list(2);
s.append(&partial_key.encoded(is_leaf)); s.append(&partial_key.encoded(is_leaf));
s.append(&value.to_vec()); // WTF?!?! s.append(&value.to_vec()); // WTF?!?!
//s.append(value); // <-- should be. //s.append(value); // <-- should be.
s.out() let r = s.out();
println!("output: -> {:?}", &r);
r
} }
} }
@ -127,6 +133,7 @@ impl Trie for TrieDB {
#[test] #[test]
fn playpen() { fn playpen() {
use overlaydb::*; use overlaydb::*;
use triehash::*;
(&[1, 2, 3]).starts_with(&[1, 2]); (&[1, 2, 3]).starts_with(&[1, 2]);
@ -134,5 +141,7 @@ fn playpen() {
t.init(); t.init();
assert_eq!(*t.root(), SHA3_NULL_RLP); assert_eq!(*t.root(), SHA3_NULL_RLP);
assert!(t.is_empty()); assert!(t.is_empty());
t.insert(&[0x01u8, 0x23], &[0x01u8, 0x23]); t.insert(&[0x01u8, 0x23], &[0x01u8, 0x23]);
assert_eq!(*t.root(), hash256(&[ NibblePair::new_raw(vec![0x01u8, 0x23], vec![0x01u8, 0x23])]));
} }