rename trie to patricia-trie

ethcore/light/src/lib.rs

@@ -78,7 +78,7 @@ extern crate heapsize;
 extern crate futures;
 extern crate itertools;
 extern crate memorydb;
-extern crate trie;
+extern crate patricia_trie as trie;
 extern crate rand;
 extern crate rlp;
 extern crate parking_lot;

ethcore/light/src/types/request/mod.rs

@@ -1542,7 +1542,7 @@ pub mod epoch_signal {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
 	use bigint::hash::H256;
-	use util::Bytes;
+	use bytes::Bytes;
 
 	/// Potentially incomplete epoch signal request.
 	#[derive(Debug, Clone, PartialEq, Eq)]