From dea6d457f4aeee9ceaba2266bce176e5bb45b799 Mon Sep 17 00:00:00 2001 From: Andrew Poelstra Date: Mon, 11 Aug 2014 19:20:39 -0700 Subject: [PATCH] Clean up `read_uint` as in PR #2 (thanks @jkozera) --- src/blockdata/script.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/blockdata/script.rs b/src/blockdata/script.rs index 332bee44..74b1700d 100644 --- a/src/blockdata/script.rs +++ b/src/blockdata/script.rs @@ -190,14 +190,10 @@ pub fn read_scriptbool(v: &[u8]) -> bool { /// Read a script-encoded unsigned integer pub fn read_uint<'a, I:Iterator<(uint, &'a u8)>>(mut iter: I, size: uint) -> Result { - let mut sh = 0; let mut ret = 0; - for _ in range(0, size) { + for i in range(0, size) { match iter.next() { - Some((_, &n)) => { - ret += n as uint << sh; - sh += 8; - } + Some((_, &n)) => ret += n as uint << (i * 8), None => { return Err(EarlyEndOfScript); } } }