Box TrieErrors

ethcore/light/src/on_demand/request.rs

@@ -652,16 +652,11 @@ impl From<::rlp::DecoderError> for Error {
 	}
 }
 
-impl From<TrieError> for Error {
-	fn from(err: TrieError) -> Self {
-		Error::Trie(err)
+impl From<Box<TrieError>> for Error {
+	fn from(err: Box<TrieError>) -> Self {
+		Error::Trie(*err)
 	}
 }
-// impl From<Box<TrieError>> for Error {
-// 	fn from(err: Box<TrieError>) -> Self {
-// 		Error::Trie(*err)
-// 	}
-// }
 
 /// Request for header proof by number
 #[derive(Debug, Clone, PartialEq, Eq)]

ethcore/src/client/evm_test_client.rs

@@ -31,7 +31,7 @@ use ethtrie;
 #[derive(Debug)]
 pub enum EvmTestError {
 	/// Trie integrity error.
-	Trie(ethtrie::TrieError),
+	Trie(Box<ethtrie::TrieError>),
 	/// EVM error.
 	Evm(vm::Error),
 	/// Initialization error.

ethcore/src/state/mod.rs

@@ -381,7 +381,7 @@ impl<B: Backend> State<B> {
 	/// Creates new state with existing state root
 	pub fn from_existing(db: B, root: H256, account_start_nonce: U256, factories: Factories) -> TrieResult<State<B>> {
 		if !db.as_hashdb().contains(&root) {
-			return Err(TrieError::InvalidStateRoot(root));
+			return Err(Box::new(TrieError::InvalidStateRoot(root)));
 		}
 
 		let state = State {

util/patricia_trie/src/lib.rs

@@ -105,8 +105,8 @@ impl<T, E> error::Error for TrieError<T, E> where T: std::fmt::Debug, E: std::er
 	}
 }
 
-/// Trie result type. Boxed to avoid copying around extra space for the `Hasher`s `Out`s on successful queries.
-pub type Result<T, H, E> = ::std::result::Result<T, TrieError<H, E>>;
+/// Trie result type. Boxed to avoid copying around extra space for the `Hasher`s `Out` on successful queries.
+pub type Result<T, H, E> = ::std::result::Result<T, Box<TrieError<H, E>>>;
 
 
 /// Trie-Item type used for iterators over trie data.

util/patricia_trie/src/lookup.rs

@@ -49,14 +49,10 @@ where
 		for depth in 0.. {
 			let node_data = match self.db.get(&hash) {
 				Some(value) => value,
-				None => return Err(match depth {
+				None => return Err(Box::new(match depth {
 					0 => TrieError::InvalidStateRoot(hash),
 					_ => TrieError::IncompleteDatabase(hash),
-				}),
-				// None => return Err(Box::new(match depth {
-				// 	0 => TrieError::<_, C::E>::InvalidStateRoot(hash),
-				// 	_ => TrieError::<_, C::E>::IncompleteDatabase(hash),
-				// })),
+				})),
 			};
 
 			self.query.record(&hash, &node_data, depth);
@@ -68,8 +64,7 @@ where
 				let decoded = match C::decode(node_data) {
 					Ok(node) => node,
 					Err(e) => {
-						return Err(TrieError::DecoderError(hash, e))
-						// return Err(Box::new(TrieError::DecoderError(hash, Box::new(e))))
+						return Err(Box::new(TrieError::DecoderError(hash, e)))
 					}
 				};
 				match decoded {

util/patricia_trie/src/triedb.rs

@@ -79,8 +79,7 @@ where
 	/// Returns an error if `root` does not exist
 	pub fn new(db: &'db HashDB<H>, root: &'db H::Out) -> Result<Self, H::Out, C::E> {
 		if !db.contains(root) {
-			Err(TrieError::InvalidStateRoot(*root))
-			// Err(Box::new(TrieError::InvalidStateRoot(*root)))
+			Err(Box::new(TrieError::InvalidStateRoot(*root)))
 		} else {
 			Ok(TrieDB {db, root, hash_count: 0, codec_marker: PhantomData})
 		}
@@ -93,8 +92,7 @@ where
 	fn root_data(&self) -> Result<DBValue, H::Out, C::E> {
 		self.db
 			.get(self.root)
-			.ok_or_else(|| TrieError::InvalidStateRoot(*self.root))
-			// .ok_or_else(|| Box::new(TrieError::InvalidStateRoot(*self.root)))
+			.ok_or_else(|| Box::new(TrieError::InvalidStateRoot(*self.root)))
 	}
 
 	/// Given some node-describing data `node`, return the actual node RLP.
@@ -103,8 +101,7 @@ where
 	fn get_raw_or_lookup(&'db self, node: &'db [u8]) -> Result<DBValue, H::Out, C::E> {
 		match C::try_decode_hash(node) {
 			Some(key) => {
-				self.db.get(&key).ok_or_else(|| TrieError::IncompleteDatabase(key))
-				// self.db.get(&key).ok_or_else(|| Box::new(TrieError::IncompleteDatabase(key)))
+				self.db.get(&key).ok_or_else(|| Box::new(TrieError::IncompleteDatabase(key)))
 			}
 			None => Ok(DBValue::from_slice(node))
 		}

util/patricia_trie/src/triedbmut.rs

@@ -339,8 +339,7 @@ where
 	/// Returns an error if `root` does not exist.
 	pub fn from_existing(db: &'a mut HashDB<H>, root: &'a mut H::Out) -> Result<Self, H::Out, C::E> {
 		if !db.contains(root) {
-			return Err(TrieError::InvalidStateRoot(*root));
-			// return Err(Box::new(TrieError::InvalidStateRoot(*root)));
+			return Err(Box::new(TrieError::InvalidStateRoot(*root)));
 		}
 
 		let root_handle = NodeHandle::Hash(*root);