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

less commented out code in trie.

Browse Source
This commit is contained in:
Gav Wood 2015-12-01 01:52:20 +01:00
parent e8ca520dad
commit cceae8ecc2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/trie.rs
View File

@ -121,9 +121,8 @@ impl TrieDB {
r r
} }
/* fn compose_raw(partial: &NibbleSlice, raw_payload: &[u8], is_leaf: bool) -> Bytes {
fn compose_raw(partial: &NibbleSlice, raw_payload: &[u8], bool is_leaf) -> Bytes { println!("compose_raw {:?} {:?} {:?} ({:?})", partial, raw_payload, is_leaf, partial.encoded(is_leaf));
println!("compose_raw {:?} {:?} {:?} ({:?})", partial, value, is_leaf, partial.encoded(is_leaf));
let mut s = RlpStream::new_list(2); let mut s = RlpStream::new_list(2);
s.append(&partial.encoded(is_leaf)); s.append(&partial.encoded(is_leaf));
s.append_raw(raw_payload, 1); s.append_raw(raw_payload, 1);
@ -138,18 +137,21 @@ impl TrieDB {
/// 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(&self, rlp: &Rlp, &mut diff) -> Bytes { fn take_node(&self, rlp: &Rlp, diff: &mut Diff) -> Bytes {
if (rlp.is_data()) { if (rlp.is_list()) {
Bytes::decode(rlp) rlp.raw().to_vec()
} }
else { else if (rlp.is_data() && rlp.size() == 32) {
let h = H256::decode(rlp); let h = H256::decode(rlp);
let r = self.db.lookup(&h).expect("Trie root not found!").as_vec(); let r = self.db.lookup(&h).expect("Trie root not found!").to_vec();
diff.delete_node(h); diff.delete_node_sha3(h);
r r
} }
else {
panic!("Empty or invalid node given?");
}
} }
/*
/// Transform an existing extension or leaf node plus a new partial/value to a two-entry branch. /// Transform an existing extension or leaf node plus a new partial/value to a two-entry branch.
/// ///
/// **This operation will not insert the new node nor destroy the original.** /// **This operation will not insert the new node nor destroy the original.**
@ -341,6 +343,4 @@ fn playpen() {
t.insert(&[0x01u8, 0x23], &[0x01u8, 0x23]); t.insert(&[0x01u8, 0x23], &[0x01u8, 0x23]);
assert_eq!(*t.root(), trie_root(vec![ (vec![1u8, 0x23], vec![1u8, 0x23]) ])); assert_eq!(*t.root(), trie_root(vec![ (vec![1u8, 0x23], vec![1u8, 0x23]) ]));
assert!(false);
} }