Merge branch 'master' into pow

src/common.rs

@@ -34,3 +34,8 @@ macro_rules! xx {
 		From::from(From::from($x))
 	}
 }
+
+pub fn flush(s: String) {
+	::std::io::stdout().write(s.as_bytes()).unwrap();
+	::std::io::stdout().flush().unwrap();
+}

src/trie/triedb.rs

@@ -1,10 +1,7 @@
-use std::fmt;
+use common::*;
 use hashdb::*;
-use hash::*;
 use nibbleslice::*;
-use bytes::*;
 use rlp::*;
-use std::collections::HashMap;
 use super::trietraits::*;
 use super::node::*;
 
@@ -44,7 +41,10 @@ impl<'db> TrieDB<'db> {
 	/// Create a new trie with the backing database `db` and `root`
 	/// Panics, if `root` does not exist
 	pub fn new(db: &'db HashDB, root: &'db H256) -> Self {
-		assert!(db.exists(root));
+		if !db.exists(root) {
+			flush(format!("Trie root not found {}", root));
+			panic!("Trie root not found!");
+		}
 		TrieDB { 
 			db: db, 
 			root: root,

src/trie/triedbmut.rs

@@ -1,10 +1,7 @@
-use std::fmt;
+use common::*;
 use hashdb::*;
-use hash::*;
 use nibbleslice::*;
-use bytes::*;
 use rlp::*;
-use std::collections::HashMap;
 use super::node::*;
 use super::journal::*;
 use super::trietraits::*;
@@ -71,7 +68,10 @@ impl<'db> TrieDBMut<'db> {
 	/// Create a new trie with the backing database `db` and `root`
 	/// Panics, if `root` does not exist
 	pub fn from_existing(db: &'db mut HashDB, root: &'db mut H256) -> Self {
-		assert!(db.exists(root));
+		if !db.exists(root) {
+			flush(format!("Trie root not found {}", root));
+			panic!("Trie root not found!");
+		}
 		TrieDBMut { 
 			db: db, 
 			root: root,