milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Cleanup after `Instructions` refactoring 

* Changes `Option` to `Result` to avoid repeated `.ok_or(...)`
* Renames `max` to `min_push_len`
* Removes useless variable
This commit is contained in:
Martin Habovstiak 2022-02-09 18:37:34 +01:00
parent bc763259fe
commit 0ec6d96a7b
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/blockdata/script.rs
View File

@ -743,18 +743,18 @@ impl<'a> Instructions<'a> {
/// takes `len` bytes long slice from iterator and returns it advancing iterator /// takes `len` bytes long slice from iterator and returns it advancing iterator
/// if the iterator is not long enough `None` is returned and the iterator is killed /// if the iterator is not long enough `None` is returned and the iterator is killed
/// to avoid returning an infinite stream of errors. /// to avoid returning an infinite stream of errors.
fn take_slice_or_kill(&mut self, len: usize) -> Option<&'a [u8]> { fn take_slice_or_kill(&mut self, len: usize) -> Result<&'a [u8], Error> {
if self.data.len() >= len { if self.data.len() >= len {
let slice = &self.data.as_slice()[..len]; let slice = &self.data.as_slice()[..len];
self.data.nth(len.max(1) - 1); self.data.nth(len.max(1) - 1);
Some(slice) Ok(slice)
} else { } else {
self.kill(); self.kill();
None Err(Error::EarlyEndOfScript)
} }
} }
fn next_push_data_len(&mut self, len: usize, max: usize) -> Option<Result<Instruction<'a>, Error>> { fn next_push_data_len(&mut self, len: usize, min_push_len: usize) -> Option<Result<Instruction<'a>, Error>> {
let n = match read_uint_iter(&mut self.data, len) { let n = match read_uint_iter(&mut self.data, len) {
Ok(n) => n, Ok(n) => n,
// We do exhaustive matching to not forget to handle new variants if we extend // We do exhaustive matching to not forget to handle new variants if we extend
@ -766,11 +766,11 @@ impl<'a> Instructions<'a> {
return Some(Err(Error::EarlyEndOfScript)); return Some(Err(Error::EarlyEndOfScript));
}, },
}; };
if self.enforce_minimal && n < max { if self.enforce_minimal && n < min_push_len {
self.kill(); self.kill();
return Some(Err(Error::NonMinimalPush)); return Some(Err(Error::NonMinimalPush));
} }
Some(self.take_slice_or_kill(n).map(Instruction::PushBytes).ok_or(Error::EarlyEndOfScript)) Some(self.take_slice_or_kill(n).map(Instruction::PushBytes))
} }
} }
@ -801,7 +801,7 @@ impl<'a> Iterator for Instructions<'a> {
Some(Ok(Instruction::PushBytes(&[]))) Some(Ok(Instruction::PushBytes(&[])))
}, },
_ => { _ => {
Some(self.take_slice_or_kill(n).map(Instruction::PushBytes).ok_or(Error::EarlyEndOfScript)) Some(self.take_slice_or_kill(n).map(Instruction::PushBytes))
} }
} }
} }
@ -816,8 +816,7 @@ impl<'a> Iterator for Instructions<'a> {
} }
// Everything else we can push right through // Everything else we can push right through
_ => { _ => {
let ret = Some(Ok(Instruction::Op(opcodes::All::from(byte)))); Some(Ok(Instruction::Op(opcodes::All::from(byte))))
ret
} }
} }
} }