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

Logging.

Browse Source
This commit is contained in:
Gav Wood 2015-12-01 01:44:18 +01:00
parent eb8f04a3e6
commit 26f29b2fcd
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib.rs
View File

@ -12,6 +12,7 @@ extern crate num;
extern crate log; extern crate log;
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;
extern crate env_logger;
extern crate time; extern crate time;
extern crate crypto as rcrypto; extern crate crypto as rcrypto;

51
src/trie.rs
View File

@ -85,7 +85,7 @@ impl TrieDB {
fn set_root_rlp(&mut self, root_data: &[u8]) { fn set_root_rlp(&mut self, root_data: &[u8]) {
self.db.kill(&self.root); 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); trace!("set_root_rlp {:?} {:?}", root_data, self.root);
} }
fn apply(&mut self, diff: Diff) { fn apply(&mut self, diff: Diff) {
@ -102,15 +102,26 @@ impl TrieDB {
} }
} }
} }
/*
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: Diff = Diff::new(); let mut todo: Diff = Diff::new();
let root_rlp = self.inject(self.db.lookup(&self.root).expect("Trie root not found!"), key, value, &mut todo); let root_rlp = self.inject(self.db.lookup(&self.root).expect("Trie root not found!"), key, value, &mut todo);
self.apply(todo); self.apply(todo);
self.set_root_rlp(&root_rlp); self.set_root_rlp(&root_rlp);
} }
fn compose_leaf(partial: &NibbleSlice, value: &[u8]) -> Bytes {
trace!("compose_leaf {:?} {:?} ({:?})", partial, value, partial.encoded(true));
let mut s = RlpStream::new_list(2);
s.append(&partial.encoded(true));
s.append(&value);
let r = s.out();
trace!("output: -> {:?}", &r);
r
}
/*
fn compose_raw(partial: &NibbleSlice, raw_payload: &[u8], bool is_leaf) -> Bytes { fn compose_raw(partial: &NibbleSlice, raw_payload: &[u8], bool is_leaf) -> Bytes {
println!("compose_raw {:?} {:?} {:?} ({:?})", partial, value, 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);
@ -121,16 +132,6 @@ impl TrieDB {
r r
} }
fn compose_leaf(partial: &NibbleSlice, value: &[u8]) -> Bytes {
println!("compose_leaf {:?} {:?} ({:?})", partial, value, partial.encoded(true));
let mut s = RlpStream::new_list(2);
s.append(&partial.encoded(true));
s.append(value);
let r = s.out();
println!("output: -> {:?}", &r);
r
}
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)
} }
@ -232,6 +233,7 @@ impl TrieDB {
diff.new_node(self.inject(old, partial, value, diff), &mut out); diff.new_node(self.inject(old, partial, value, diff), &mut out);
diff.delete_node(old, old_sha3); diff.delete_node(old, old_sha3);
} }
*/
/// Determine the RLP of the node, assuming we're inserting `partial` into the /// Determine the RLP of the node, assuming we're inserting `partial` into the
/// node currently of data `old`. This will *not* delete any hash of `old` from the database; /// node currently of data `old`. This will *not* delete any hash of `old` from the database;
@ -246,11 +248,13 @@ impl TrieDB {
let old_rlp = Rlp::new(old); let old_rlp = Rlp::new(old);
match old_rlp.prototype() { match old_rlp.prototype() {
Prototype::List(17) => { Prototype::List(17) => {
unimplemented!();
// already have a branch. route and inject. // already have a branch. route and inject.
self.injected_into_branch(old_rlp, partial, value, diff) // self.injected_into_branch(old_rlp, partial, value, diff)
}, },
Prototype::List(2) => { Prototype::List(2) => {
let their_key_rlp = old_rlp.at(0); unimplemented!();
/* let their_key_rlp = old_rlp.at(0);
let (them, is_leaf) = NibbleSlice::from_encoded(their_key_rlp.data()); let (them, is_leaf) = NibbleSlice::from_encoded(their_key_rlp.data());
match partial.common_prefix(&them) { match partial.common_prefix(&them) {
@ -290,15 +294,14 @@ impl TrieDB {
diff.new_node(injected_low, s); diff.new_node(injected_low, s);
s.out() s.out()
}, },
} }*/
}, },
Prototype::Data(0) => { Prototype::Data(0) => {
(Self::compose_leaf(partial, value, true), Diff::new()) Self::compose_leaf(partial, value)
}, },
_ => panic!("Invalid RLP for node."), _ => panic!("Invalid RLP for node."),
} }
} }
*/
} }
impl Trie for TrieDB { impl Trie for TrieDB {
@ -313,8 +316,7 @@ impl Trie for TrieDB {
} }
fn insert(&mut self, key: &[u8], value: &[u8]) { fn insert(&mut self, key: &[u8], value: &[u8]) {
unimplemented!(); (self as &mut TrieDB).add(&NibbleSlice::new(key), value);
// (self as &mut TrieDB).add(&NibbleSlice::new(key), value);
} }
fn remove(&mut self, _key: &[u8]) { fn remove(&mut self, _key: &[u8]) {
@ -326,6 +328,9 @@ impl Trie for TrieDB {
fn playpen() { fn playpen() {
use overlaydb::*; use overlaydb::*;
use triehash::*; use triehash::*;
use env_logger;
env_logger::init().unwrap();
(&[1, 2, 3]).starts_with(&[1, 2]); (&[1, 2, 3]).starts_with(&[1, 2]);
@ -333,7 +338,9 @@ 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(), trie_root(vec![ (vec![1u8, 0x23], vec![1u8, 0x23]) ]));*/ assert_eq!(*t.root(), trie_root(vec![ (vec![1u8, 0x23], vec![1u8, 0x23]) ]));
assert!(false);
} }