frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use default: D mirroring Rust documentation

Browse Source 
Currently we use `F: f` for the argument that is the default function
passed to `map_or_else` and pass a closure for the second argument. This
bent my brain while reading the documentation because the docs use
`default: D` for the first and `f: F` for the second. Although this is
totally trivial it makes deciphering the combinator chain easier if we
name the arguments the same way the Rust docs do.

Use `default: D` for the identifier of the default function passed into `map_or_else`.
This commit is contained in:
Tobin Harding 2021-05-06 13:54:52 +10:00
parent 3c7bae9ce9
commit 9aea90bd81
No known key found for this signature in database
GPG Key ID: 40BF9E4C269D6607
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/database/mod.rs
View File

@ -164,14 +164,14 @@ pub(crate) trait DatabaseUtils: Database {
.map(|o| o.is_some()) .map(|o| o.is_some())
} }
fn get_raw_tx_or<F>(&self, txid: &Txid, f: F) -> Result<Option<Transaction>, Error> fn get_raw_tx_or<D>(&self, txid: &Txid, default: D) -> Result<Option<Transaction>, Error>
where where
F: FnOnce() -> Result<Option<Transaction>, Error>, D: FnOnce() -> Result<Option<Transaction>, Error>,
{ {
self.get_tx(txid, true)? self.get_tx(txid, true)?
.map(|t| t.transaction) .map(|t| t.transaction)
.flatten() .flatten()
.map_or_else(f, |t| Ok(Some(t))) .map_or_else(default, |t| Ok(Some(t)))
} }
fn get_previous_output(&self, outpoint: &OutPoint) -> Result<Option<TxOut>, Error> { fn get_previous_output(&self, outpoint: &OutPoint) -> Result<Option<TxOut>, Error> {