Make HashDB generic

util/patricia-trie-ethereum/Cargo.toml

@@ -12,8 +12,4 @@ hashdb = { path = "../hashdb" }
 rlp = { path = "../rlp" }
 ethcore-bytes = { path = "../bytes" }
 ethereum-types = "0.3"
-elastic-array = "0.10"
-log = "0.3" # TODO: remove
-
-[dev-dependencies]
-env_logger = "*"  # TODO: remove
+elastic-array = "0.10"

util/patricia_trie/src/nibbleslice.rs

@@ -105,9 +105,11 @@ impl<'a> NibbleSlice<'a> {
 	pub fn is_empty(&self) -> bool { self.len() == 0 }
 
 	/// Get the length (in nibbles, naturally) of this slice.
+	#[inline]
 	pub fn len(&self) -> usize { (self.data.len() + self.data_encode_suffix.len()) * 2 - self.offset - self.offset_encode_suffix }
 
 	/// Get the nibble at position `i`.
+	#[inline(always)]
 	pub fn at(&self, i: usize) -> u8 {
 		let l = self.data.len() * 2 - self.offset;
 		if i < l {
@@ -154,6 +156,7 @@ impl<'a> NibbleSlice<'a> {
 	}
 
 	/// Encode while nibble slice in prefixed hex notation, noting whether it `is_leaf`.
+	#[inline(always)]
 	pub fn encoded(&self, is_leaf: bool) -> ElasticArray36<u8> {
 		let l = self.len();
 		let mut r = ElasticArray36::new();

util/patricia_trie/src/nibblevec.rs

@@ -41,12 +41,14 @@ impl NibbleVec {
 	}
 
 	/// Length of the `NibbleVec`
+	#[inline(always)]
 	pub fn len(&self) -> usize { self.len }
 
 	/// Retrurns true if `NibbleVec` has zero length
 	pub fn is_empty(&self) -> bool { self.len == 0 }
 
 	/// Try to get the nibble at the given offset.
+	#[inline]
 	pub fn at(&self, idx: usize) -> u8 {
 		if idx % 2 == 0 {
 			self.inner[idx / 2] >> 4