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

eagerly unwrap height option, save one collect

Browse Source
This commit is contained in:
Riccardo Casatta 2020-11-17 15:50:15 +01:00
parent 16fde66c6a
commit 02c0ad2fca
No known key found for this signature in database
GPG Key ID: FD986A969E450397
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/blockchain/utils.rs
View File

@ -251,31 +251,29 @@ pub trait ElectrumLikeSync {
chunk_size: usize, chunk_size: usize,
) -> Result<HashMap<Txid, u64>, Error> { ) -> Result<HashMap<Txid, u64>, Error> {
let mut txid_timestamp = HashMap::new(); let mut txid_timestamp = HashMap::new();
let needed_txid_height: HashMap<&Txid, &Option<u32>> = txid_height let needed_txid_height: HashMap<&Txid, u32> = txid_height
.iter() .iter()
.filter(|(txid, _)| txs_details_in_db.get(*txid).is_none()) .filter(|(t, _)| txs_details_in_db.get(*t).is_none())
.filter_map(|(t, o)| o.map(|h| (t, h)))
.collect(); .collect();
let needed_heights: HashSet<u32> = let needed_heights: HashSet<u32> = needed_txid_height.values().cloned().collect();
needed_txid_height.iter().filter_map(|(_, b)| **b).collect();
if !needed_heights.is_empty() { if !needed_heights.is_empty() {
info!("{} headers to download for timestamp", needed_heights.len()); info!("{} headers to download for timestamp", needed_heights.len());
let mut height_timestamp: HashMap<u32, u64> = HashMap::new(); let mut height_timestamp: HashMap<u32, u64> = HashMap::new();
for chunk in ChunksIterator::new(needed_heights.into_iter(), chunk_size) { for chunk in ChunksIterator::new(needed_heights.into_iter(), chunk_size) {
let call_result: Vec<BlockHeader> = let call_result: Vec<BlockHeader> =
maybe_await!(self.els_batch_block_header(chunk.clone()))?; maybe_await!(self.els_batch_block_header(chunk.clone()))?;
let vec: Vec<(u32, u64)> = chunk height_timestamp.extend(
.into_iter() chunk
.zip(call_result.iter().map(|h| h.time as u64)) .into_iter()
.collect(); .zip(call_result.iter().map(|h| h.time as u64)),
height_timestamp.extend(vec); );
} }
for (txid, height_opt) in needed_txid_height { for (txid, height) in needed_txid_height {
if let Some(height) = height_opt { let timestamp = height_timestamp
let timestamp = height_timestamp .get(&height)
.get(height) .ok_or_else(|| Error::Generic("timestamp missing".to_string()))?;
.ok_or_else(|| Error::Generic("timestamp missing".to_string()))?; txid_timestamp.insert(*txid, *timestamp);
txid_timestamp.insert(*txid, *timestamp);
}
} }
} }