octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync: unindent fetch task

This commit is contained in:
Henry de Valence 2020-07-21 15:40:00 -07:00
parent b722818e02
commit 928b0beb5d
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
zebrad/src/commands/start/sync.rs
View File

@ -320,26 +320,25 @@ where
let mut retry_peer_set = self.block_network.clone(); let mut retry_peer_set = self.block_network.clone();
let mut verifier = self.verifier.clone(); let mut verifier = self.verifier.clone();
let span = tracing::info_span!("block_fetch_verify", ?hash); let span = tracing::info_span!("block_fetch_verify", ?hash);
self.pending_blocks.push( let task = tokio::spawn(async move {
tokio::spawn(async move { let block = match retry_peer_set
let block = match retry_peer_set .ready_and()
.ready_and() .await?
.await? .call(zn::Request::BlocksByHash(iter::once(hash).collect()))
.call(zn::Request::BlocksByHash(iter::once(hash).collect())) .await
.await {
{ Ok(zn::Response::Blocks(blocks)) => blocks
Ok(zn::Response::Blocks(blocks)) => blocks .into_iter()
.into_iter() .next()
.next() .expect("successful response has the block in it"),
.expect("successful response has the block in it"), Ok(_) => unreachable!("wrong response to block request"),
Ok(_) => unreachable!("wrong response to block request"), Err(e) => return Err(e),
Err(e) => return Err(e), };
};
verifier.ready_and().await?.call(block).await verifier.ready_and().await?.call(block).await
}) })
.instrument(span), .instrument(span);
); self.pending_blocks.push(task);
} }
Ok(()) Ok(())