zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "deduplicate match arms in handle_client_request" 

This reverts commit 2adee7b31a.
This commit is contained in:
teor 2021-02-23 10:54:48 +10:00 committed by Jane Lusby
parent 292a4391e2
commit 86dc66dfa9
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
zebra-network/src/peer/connection.rs
View File

@ -564,16 +564,6 @@ where
use Request::*;
let InProgressClientRequest { request, tx, span } = req;
// common logic for client requests without an expected response
fn continue_without_response(
tx: MustUseOneshotSender<Result<Response, SharedPeerError>>,
) -> Transition {
// Since we're not waiting for further messages, we need to
// send a response before dropping tx.
let _ = tx.send(Ok(Response::Nil));
Transition::AwaitRequest
}
match request {
Peers => match self.peer_tx.send(Message::GetAddr).await {
Ok(()) => Transition::AwaitResponse {
@ -667,7 +657,12 @@ where
},
PushTransaction(transaction) => {
match self.peer_tx.send(Message::Tx(transaction)).await {
Ok(()) => continue_without_response(tx),
Ok(()) => {
// Since we're not waiting for further messages, we need to
// send a response before dropping tx.
let _ = tx.send(Ok(Response::Nil));
Transition::AwaitRequest
}
Err(e) => Transition::CloseResponse { e: e.into(), tx },
}
}
@ -677,13 +672,23 @@ where
.send(Message::Inv(hashes.iter().map(|h| (*h).into()).collect()))
.await
{
Ok(()) => continue_without_response(tx),
Ok(()) => {
// Since we're not waiting for further messages, we need to
// send a response before dropping tx.
let _ = tx.send(Ok(Response::Nil));
Transition::AwaitRequest
}
Err(e) => Transition::CloseResponse { e: e.into(), tx },
}
}
AdvertiseBlock(hash) => {
match self.peer_tx.send(Message::Inv(vec![hash.into()])).await {
Ok(()) => continue_without_response(tx),
Ok(()) => {
// Since we're not waiting for further messages, we need to
// send a response before dropping tx.
let _ = tx.send(Ok(Response::Nil));
Transition::AwaitRequest
}
Err(e) => Transition::CloseResponse { e: e.into(), tx },
}
}