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

This commit is contained in:
Gav Wood 2015-12-01 20:35:47 +01:00
commit 4be633ad94

View File

@ -210,8 +210,10 @@ impl TrieDB {
let rlp = self.db.lookup(&H256::from_slice(sha3)).expect("sha3 not found!"); let rlp = self.db.lookup(&H256::from_slice(sha3)).expect("sha3 not found!");
try!(self.fmt_all(rlp, f, deepness + 1)); try!(self.fmt_all(rlp, f, deepness + 1));
}, },
Node::Branch(Some(ref nodes), _) => { Node::Branch(Some(ref nodes), ref value) => {
try!(writeln!(f, "Branch: ")); try!(writeln!(f, "Branch: "));
try!(self.fmt_indent(f, deepness + 1));
try!(writeln!(f, ": {:?}", value.pretty()));
for i in 0..16 { for i in 0..16 {
match Node::decoded(nodes[i]) { match Node::decoded(nodes[i]) {
Node::Branch(None, _) => (), Node::Branch(None, _) => (),