diff --git a/src/blockchain/electrum.rs b/src/blockchain/electrum.rs index 3d316a75..53fb6e86 100644 --- a/src/blockchain/electrum.rs +++ b/src/blockchain/electrum.rs @@ -111,10 +111,10 @@ impl Blockchain for ElectrumBlockchain { script_req.satisfy(txids_per_script)? } - Request::Conftime(conftimereq) => { + Request::Conftime(conftime_req) => { // collect up to chunk_size heights to fetch from electrum let needs_block_height = { - let mut needs_block_height_iter = conftimereq + let mut needs_block_height_iter = conftime_req .request() .filter_map(|txid| txid_to_height.get(txid).cloned()) .filter(|height| block_times.get(height).is_none()); @@ -137,7 +137,7 @@ impl Blockchain for ElectrumBlockchain { block_times.insert(height, header.time); } - let conftimes = conftimereq + let conftimes = conftime_req .request() .take(chunk_size) .map(|txid| { @@ -156,10 +156,10 @@ impl Blockchain for ElectrumBlockchain { }) .collect::>()?; - conftimereq.satisfy(conftimes)? + conftime_req.satisfy(conftimes)? } - Request::Tx(txreq) => { - let needs_full = txreq.request().take(chunk_size); + Request::Tx(tx_req) => { + let needs_full = tx_req.request().take(chunk_size); tx_cache.save_txs(needs_full.clone())?; let full_transactions = needs_full .map(|txid| tx_cache.get(*txid).ok_or_else(electrum_goof)) @@ -196,7 +196,7 @@ impl Blockchain for ElectrumBlockchain { }) .collect::, Error>>()?; - txreq.satisfy(full_details)? + tx_req.satisfy(full_details)? } Request::Finish(batch_update) => break batch_update, } diff --git a/src/blockchain/esplora/reqwest.rs b/src/blockchain/esplora/reqwest.rs index 8a39cd30..626b8741 100644 --- a/src/blockchain/esplora/reqwest.rs +++ b/src/blockchain/esplora/reqwest.rs @@ -150,8 +150,8 @@ impl Blockchain for EsploraBlockchain { script_req.satisfy(satisfaction)? } - Request::Conftime(conftimereq) => { - let conftimes = conftimereq + Request::Conftime(conftime_req) => { + let conftimes = conftime_req .request() .map(|txid| { tx_index @@ -160,17 +160,17 @@ impl Blockchain for EsploraBlockchain { .confirmation_time() }) .collect(); - conftimereq.satisfy(conftimes)? + conftime_req.satisfy(conftimes)? } - Request::Tx(txreq) => { - let full_txs = txreq + Request::Tx(tx_req) => { + let full_txs = tx_req .request() .map(|txid| { let tx = tx_index.get(txid).expect("must be in index"); (tx.previous_outputs(), tx.to_tx()) }) .collect(); - txreq.satisfy(full_txs)? + tx_req.satisfy(full_txs)? } Request::Finish(batch_update) => break batch_update, } diff --git a/src/blockchain/esplora/ureq.rs b/src/blockchain/esplora/ureq.rs index 9c980f74..339843e6 100644 --- a/src/blockchain/esplora/ureq.rs +++ b/src/blockchain/esplora/ureq.rs @@ -149,8 +149,8 @@ impl Blockchain for EsploraBlockchain { script_req.satisfy(satisfaction)? } - Request::Conftime(conftimereq) => { - let conftimes = conftimereq + Request::Conftime(conftime_req) => { + let conftimes = conftime_req .request() .map(|txid| { tx_index @@ -159,17 +159,17 @@ impl Blockchain for EsploraBlockchain { .confirmation_time() }) .collect(); - conftimereq.satisfy(conftimes)? + conftime_req.satisfy(conftimes)? } - Request::Tx(txreq) => { - let full_txs = txreq + Request::Tx(tx_req) => { + let full_txs = tx_req .request() .map(|txid| { let tx = tx_index.get(txid).expect("must be in index"); (tx.previous_outputs(), tx.to_tx()) }) .collect(); - txreq.satisfy(full_txs)? + tx_req.satisfy(full_txs)? } Request::Finish(batch_update) => break batch_update, } diff --git a/src/blockchain/script_sync.rs b/src/blockchain/script_sync.rs index 247e8154..da3e6486 100644 --- a/src/blockchain/script_sync.rs +++ b/src/blockchain/script_sync.rs @@ -12,7 +12,7 @@ use bitcoin::{OutPoint, Script, Transaction, TxOut, Txid}; use log::*; use std::collections::{HashMap, HashSet, VecDeque}; -/// A reqeust for on-chain information +/// A request for on-chain information pub enum Request<'a, D: BatchDatabase> { /// A request for transactions related to script pubkeys. Script(ScriptReq<'a, D>),