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

Use get_or_insert_with in segwit_cache 

This refactors the code to make it possible to use `get_or_insert_with`
instead of unwrapping in `segwit_cache()`. To achieve it `common_cache`
is refactored into two functions: one taking only the required borrows
and the original calling the new one. `segwit_cache` then calls the new
function so that borrows are OK.

Apart from removing unwrap, this avoids calling `common_cache` multiple
times.
This commit is contained in:
Martin Habovstiak 2021-08-10 10:36:51 +02:00
parent 497dbfb7c3
commit 07774917c2
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/util/sighash.rs
View File

@ -549,9 +549,13 @@ impl<R: Deref<Target = Transaction>> SigHashCache<R> {
Ok(SigHash::from_engine(enc)) Ok(SigHash::from_engine(enc))
} }
#[inline]
fn common_cache(&mut self) -> &CommonCache { fn common_cache(&mut self) -> &CommonCache {
let tx = &self.tx; Self::common_cache_minimal_borrow(&mut self.common_cache, &self.tx)
self.common_cache.get_or_insert_with(|| { }
fn common_cache_minimal_borrow<'a>(common_cache: &'a mut Option<CommonCache>, tx: &R) -> &'a CommonCache {
common_cache.get_or_insert_with(|| {
let mut enc_prevouts = sha256::Hash::engine(); let mut enc_prevouts = sha256::Hash::engine();
let mut enc_sequences = sha256::Hash::engine(); let mut enc_sequences = sha256::Hash::engine();
for txin in tx.input.iter() { for txin in tx.input.iter() {
@ -575,21 +579,22 @@ impl<R: Deref<Target = Transaction>> SigHashCache<R> {
} }
fn segwit_cache(&mut self) -> &SegwitCache { fn segwit_cache(&mut self) -> &SegwitCache {
if self.segwit_cache.is_none() { let common_cache = &mut self.common_cache;
let cache = SegwitCache { let tx = &self.tx;
self.segwit_cache.get_or_insert_with(|| {
let common_cache = Self::common_cache_minimal_borrow(common_cache, tx);
SegwitCache {
prevouts: sha256d::Hash::from_inner( prevouts: sha256d::Hash::from_inner(
sha256::Hash::hash(&self.common_cache().prevouts).into_inner(), sha256::Hash::hash(&common_cache.prevouts).into_inner(),
), ),
sequences: sha256d::Hash::from_inner( sequences: sha256d::Hash::from_inner(
sha256::Hash::hash(&self.common_cache().sequences).into_inner(), sha256::Hash::hash(&common_cache.sequences).into_inner(),
), ),
outputs: sha256d::Hash::from_inner( outputs: sha256d::Hash::from_inner(
sha256::Hash::hash(&self.common_cache().outputs).into_inner(), sha256::Hash::hash(&common_cache.outputs).into_inner(),
), ),
}; }
self.segwit_cache = Some(cache); })
}
self.segwit_cache.as_ref().unwrap() // safe to unwrap because we checked is_none()
} }
fn taproot_cache(&mut self, prevouts: &[TxOut]) -> &TaprootCache { fn taproot_cache(&mut self, prevouts: &[TxOut]) -> &TaprootCache {