Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-25 15:39:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

"Buffer" all requests to Alice until we are connected

Browse Source 
We use the "precondition" feature of the `tokio::select!` macro to
avoid polling certain futures. In particular, we skip polling all
futures that - when resolved - require us to send a message to Alice.
This commit is contained in:
Thomas Eizinger 2021-03-31 14:21:49 +11:00
parent 1b0c29b424
commit c0785ab05a
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
swap/src/protocol/bob/event_loop.rs
View File

@ -88,6 +88,7 @@ impl EventLoop {
let _ = Swarm::dial(&mut self.swarm, &self.alice_peer_id); let _ = Swarm::dial(&mut self.swarm, &self.alice_peer_id);
loop { loop {
// Note: We are making very elaborate use of `select!` macro's feature here. Make sure to read the documentation thoroughly: https://docs.rs/tokio/1.4.0/tokio/macro.select.html
tokio::select! { tokio::select! {
swarm_event = self.swarm.next_event().fuse() => { swarm_event = self.swarm.next_event().fuse() => {
match swarm_event { match swarm_event {
@ -164,22 +165,26 @@ impl EventLoop {
_ => {} _ => {}
} }
}, },
Some((request, responder)) = self.spot_price_requests.next().fuse() => {
// Handle to-be-sent requests for all our network protocols.
// Use `self.is_connected_to_alice` as a guard to "buffer" requests until we are connected.
Some((request, responder)) = self.spot_price_requests.next().fuse(), if self.is_connected_to_alice() => {
let id = self.swarm.spot_price.send_request(&self.alice_peer_id, request); let id = self.swarm.spot_price.send_request(&self.alice_peer_id, request);
self.inflight_spot_price_requests.insert(id, responder); self.inflight_spot_price_requests.insert(id, responder);
}, },
Some(((), responder)) = self.quote_requests.next().fuse() => { Some(((), responder)) = self.quote_requests.next().fuse(), if self.is_connected_to_alice() => {
let id = self.swarm.quote.send_request(&self.alice_peer_id, ()); let id = self.swarm.quote.send_request(&self.alice_peer_id, ());
self.inflight_quote_requests.insert(id, responder); self.inflight_quote_requests.insert(id, responder);
}, },
Some((request, responder)) = self.execution_setup_requests.next().fuse() => { Some((request, responder)) = self.execution_setup_requests.next().fuse(), if self.is_connected_to_alice() => {
self.swarm.execution_setup.run(self.alice_peer_id, request, self.bitcoin_wallet.clone()); self.swarm.execution_setup.run(self.alice_peer_id, request, self.bitcoin_wallet.clone());
self.inflight_execution_setup = Some(responder); self.inflight_execution_setup = Some(responder);
}, },
Some((request, responder)) = self.encrypted_signature_requests.next().fuse() => { Some((request, responder)) = self.encrypted_signature_requests.next().fuse(), if self.is_connected_to_alice() => {
let id = self.swarm.encrypted_signature.send_request(&self.alice_peer_id, request); let id = self.swarm.encrypted_signature.send_request(&self.alice_peer_id, request);
self.inflight_encrypted_signature_requests.insert(id, responder); self.inflight_encrypted_signature_requests.insert(id, responder);
}, },
Some(response_channel) = &mut self.pending_transfer_proof => { Some(response_channel) = &mut self.pending_transfer_proof => {
let _ = self.swarm.transfer_proof.send_response(response_channel, ()); let _ = self.swarm.transfer_proof.send_response(response_channel, ());
@ -188,6 +193,10 @@ impl EventLoop {
} }
} }
} }
fn is_connected_to_alice(&self) -> bool {
Swarm::is_connected(&self.swarm, &self.alice_peer_id)
}
} }
#[derive(Debug)] #[derive(Debug)]