From 100d1c7bf69e6e8f2c2af87d268a0d9fe991e85b Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Tue, 29 Aug 2017 12:31:40 +0200
Subject: [PATCH] make triedbmut lookup shorter

---
 util/src/trie/triedbmut.rs | 77 +++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 46 deletions(-)

diff --git a/util/src/trie/triedbmut.rs b/util/src/trie/triedbmut.rs
index 7d163a15d..89eb574dc 100644
--- a/util/src/trie/triedbmut.rs
+++ b/util/src/trie/triedbmut.rs
@@ -370,62 +370,47 @@ impl<'a> TrieDBMut<'a> {
 	fn lookup<'x, 'key>(&'x self, mut partial: NibbleSlice<'key>, handle: &NodeHandle) -> super::Result<Option<DBValue>>
 		where 'x: 'key
 	{
-		enum Step<'s> {
-			Return(Option<DBValue>),
-			Lookup(usize, &'s NodeHandle),
-		}
-
 		let mut handle = handle;
 		loop {
-			let step = {
-				match *handle {
-					NodeHandle::Hash(ref hash) => {
-						let lookup = Lookup {
-							db: &*self.db,
-							query: DBValue::from_slice,
-							hash: hash.clone(),
-						}.look_up(partial)?;
-						Step::Return(lookup)
-					},
-					NodeHandle::InMemory(ref handle) => match self.storage[handle] {
-						Node::Empty => Step::Return(None),
-						Node::Leaf(ref key, ref value) => {
-							if NibbleSlice::from_encoded(key).0 == partial {
-								Step::Return(Some(DBValue::from_slice(value)))
-							} else {
-								Step::Return(None)
-							}
+			let (mid, child) = match *handle {
+				NodeHandle::Hash(ref hash) => return Lookup {
+					db: &*self.db,
+					query: DBValue::from_slice,
+					hash: hash.clone(),
+				}.look_up(partial),
+				NodeHandle::InMemory(ref handle) => match self.storage[handle] {
+					Node::Empty => return Ok(None),
+					Node::Leaf(ref key, ref value) => {
+						if NibbleSlice::from_encoded(key).0 == partial {
+							return Ok(Some(DBValue::from_slice(value)));
+						} else {
+							return Ok(None);
 						}
-						Node::Extension(ref slice, ref child) => {
-							let slice = NibbleSlice::from_encoded(slice).0;
-							if partial.starts_with(&slice) {
-								Step::Lookup(slice.len(), child)
-							} else {
-								Step::Return(None)
-							}
+					}
+					Node::Extension(ref slice, ref child) => {
+						let slice = NibbleSlice::from_encoded(slice).0;
+						if partial.starts_with(&slice) {
+							(slice.len(), child)
+						} else {
+							return Ok(None);
 						}
-						Node::Branch(ref children, ref value) => {
-							if partial.is_empty() {
-								Step::Return(value.as_ref().map(|v| DBValue::from_slice(v)))
-							} else {
-								let idx = partial.at(0);
-								match children[idx as usize].as_ref() {
-									Some(child) => Step::Lookup(1, child),
-									None => Step::Return(None),
-								}
+					}
+					Node::Branch(ref children, ref value) => {
+						if partial.is_empty() {
+							return Ok(value.as_ref().map(|v| DBValue::from_slice(v)));
+						} else {
+							let idx = partial.at(0);
+							match children[idx as usize].as_ref() {
+								Some(child) => (1, child),
+								None => return Ok(None),
 							}
 						}
 					}
 				}
 			};
 
-			match step {
-				Step::Return(r) => return Ok(r),
-				Step::Lookup(mid, child) => {
-					partial = partial.mid(mid);
-					handle = child;
-				}
-			}
+			partial = partial.mid(mid);
+			handle = child;
 		}
 	}