From c25d5ff07ee043ed68eeb8ecf836091d7b1624e0 Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Fri, 22 Jan 2021 09:38:04 +1100 Subject: [PATCH 1/2] Improve network logging --- swap/src/protocol/alice.rs | 2 +- swap/src/protocol/alice/event_loop.rs | 2 +- swap/src/protocol/alice/message0.rs | 4 ++-- swap/src/protocol/alice/message1.rs | 2 +- swap/src/protocol/alice/message2.rs | 2 +- swap/src/protocol/alice/swap_response.rs | 13 ++++++------- swap/src/protocol/bob/encrypted_signature.rs | 2 +- swap/src/protocol/bob/message0.rs | 2 +- swap/src/protocol/bob/message1.rs | 2 +- swap/src/protocol/bob/message2.rs | 2 +- swap/src/protocol/bob/swap_request.rs | 2 +- swap/src/protocol/bob/transfer_proof.rs | 5 ++++- 12 files changed, 21 insertions(+), 19 deletions(-) diff --git a/swap/src/protocol/alice.rs b/swap/src/protocol/alice.rs index 87c750fa..b2ea0a16 100644 --- a/swap/src/protocol/alice.rs +++ b/swap/src/protocol/alice.rs @@ -324,7 +324,7 @@ impl Behaviour { swap_response: SwapResponse, ) -> Result<()> { self.amounts.send(channel, swap_response)?; - info!("Sent amounts response"); + info!("Sent swap response"); Ok(()) } diff --git a/swap/src/protocol/alice/event_loop.rs b/swap/src/protocol/alice/event_loop.rs index 4caf21d5..9e28934a 100644 --- a/swap/src/protocol/alice/event_loop.rs +++ b/swap/src/protocol/alice/event_loop.rs @@ -265,7 +265,7 @@ impl EventLoop { }, transfer_proof = self.send_transfer_proof.recv().fuse() => { if let Some((bob_peer_id, msg)) = transfer_proof { - self.swarm.send_transfer_proof(bob_peer_id, msg) + self.swarm.send_transfer_proof(bob_peer_id, msg); } }, } diff --git a/swap/src/protocol/alice/message0.rs b/swap/src/protocol/alice/message0.rs index 52db26af..a2c42304 100644 --- a/swap/src/protocol/alice/message0.rs +++ b/swap/src/protocol/alice/message0.rs @@ -54,7 +54,7 @@ impl Behaviour { let msg = AliceToBob::Message0(Box::new(msg)); self.rr .send_response(channel, msg) - .map_err(|_| anyhow!("Sending Amounts response failed")) + .map_err(|alice_to_bob| anyhow!("Could not send response {:?}", alice_to_bob)) } fn poll( &mut self, @@ -112,7 +112,7 @@ impl NetworkBehaviourEventProcess> error!("Outbound failure: {:?}", error); } RequestResponseEvent::ResponseSent { .. } => { - debug!("Alice has sent an Message0 response to Bob"); + debug!("Alice has sent Message0 as response to Bob"); } } } diff --git a/swap/src/protocol/alice/message1.rs b/swap/src/protocol/alice/message1.rs index cfc17a69..94992b26 100644 --- a/swap/src/protocol/alice/message1.rs +++ b/swap/src/protocol/alice/message1.rs @@ -51,7 +51,7 @@ impl Behaviour { let msg = AliceToBob::Message1(Box::new(msg)); self.rr .send_response(channel, msg) - .map_err(|_| anyhow!("Sending Amounts response failed")) + .map_err(|alice_to_bob| anyhow!("Could not send response {:?}", alice_to_bob)) } fn poll( diff --git a/swap/src/protocol/alice/message2.rs b/swap/src/protocol/alice/message2.rs index 8a1e2ae1..b89065e3 100644 --- a/swap/src/protocol/alice/message2.rs +++ b/swap/src/protocol/alice/message2.rs @@ -97,7 +97,7 @@ impl NetworkBehaviourEventProcess> error!("Outbound failure: {:?}", error); } RequestResponseEvent::ResponseSent { .. } => { - debug!("Alice has sent an Message2 response to Bob"); + debug!("Alice has sent a Message2 response to Bob"); } } } diff --git a/swap/src/protocol/alice/swap_response.rs b/swap/src/protocol/alice/swap_response.rs index 78a1f777..62c1626c 100644 --- a/swap/src/protocol/alice/swap_response.rs +++ b/swap/src/protocol/alice/swap_response.rs @@ -1,3 +1,8 @@ +use crate::{ + monero, + network::request_response::{AliceToBob, BobToAlice, Codec, Swap, TIMEOUT}, + protocol::bob, +}; use anyhow::{anyhow, Result}; use libp2p::{ request_response::{ @@ -15,12 +20,6 @@ use std::{ }; use tracing::{debug, error}; -use crate::{ - monero, - network::request_response::{AliceToBob, BobToAlice, Codec, Swap, TIMEOUT}, - protocol::bob, -}; - #[derive(Debug)] pub struct OutEvent { pub msg: bob::SwapRequest, @@ -109,7 +108,7 @@ impl NetworkBehaviourEventProcess> error!("Outbound failure: {:?}", error); } RequestResponseEvent::ResponseSent { .. } => { - debug!("Alice has sent an Amounts response to Bob"); + debug!("Alice has sent a swap response to Bob"); } } } diff --git a/swap/src/protocol/bob/encrypted_signature.rs b/swap/src/protocol/bob/encrypted_signature.rs index 3567a4e1..cf167f36 100644 --- a/swap/src/protocol/bob/encrypted_signature.rs +++ b/swap/src/protocol/bob/encrypted_signature.rs @@ -97,7 +97,7 @@ impl NetworkBehaviourEventProcess> for B error!("Outbound failure: {:?}", error); } RequestResponseEvent::ResponseSent { .. } => { - unreachable!("Bob should never send a Amounts response to Alice"); + unreachable!("Bob does not send the encrypted signature response to Alice"); } } } diff --git a/swap/src/protocol/bob/message0.rs b/swap/src/protocol/bob/message0.rs index 3acd532e..1903a62e 100644 --- a/swap/src/protocol/bob/message0.rs +++ b/swap/src/protocol/bob/message0.rs @@ -103,7 +103,7 @@ impl NetworkBehaviourEventProcess> error!("Outbound failure: {:?}", error); } RequestResponseEvent::ResponseSent { .. } => { - unreachable!("Bob should never send a Amounts response to Alice"); + unreachable!("Bob does not send a message0 response to Alice"); } } } diff --git a/swap/src/protocol/bob/message1.rs b/swap/src/protocol/bob/message1.rs index 5b845abb..4385ad54 100644 --- a/swap/src/protocol/bob/message1.rs +++ b/swap/src/protocol/bob/message1.rs @@ -98,7 +98,7 @@ impl NetworkBehaviourEventProcess> error!("Outbound failure: {:?}", error); } RequestResponseEvent::ResponseSent { .. } => { - unreachable!("Bob should never send a Amounts response to Alice"); + unreachable!("Bob does not send a message 1 response to Alice"); } } } diff --git a/swap/src/protocol/bob/message2.rs b/swap/src/protocol/bob/message2.rs index 8b268830..c767fd8b 100644 --- a/swap/src/protocol/bob/message2.rs +++ b/swap/src/protocol/bob/message2.rs @@ -96,7 +96,7 @@ impl NetworkBehaviourEventProcess> error!("Outbound failure: {:?}", error); } RequestResponseEvent::ResponseSent { .. } => { - unreachable!("Bob should never send a Amounts response to Alice"); + unreachable!("Bob does not send a Message2 response to Alice"); } } } diff --git a/swap/src/protocol/bob/swap_request.rs b/swap/src/protocol/bob/swap_request.rs index c1a847d8..8e1440fb 100644 --- a/swap/src/protocol/bob/swap_request.rs +++ b/swap/src/protocol/bob/swap_request.rs @@ -104,7 +104,7 @@ impl NetworkBehaviourEventProcess> error!("Outbound failure: {:?}", error); } RequestResponseEvent::ResponseSent { .. } => { - error!("Bob should never send a Amounts response to Alice"); + error!("Bob does not send a swap response to Alice"); } } } diff --git a/swap/src/protocol/bob/transfer_proof.rs b/swap/src/protocol/bob/transfer_proof.rs index 55436135..6caa3475 100644 --- a/swap/src/protocol/bob/transfer_proof.rs +++ b/swap/src/protocol/bob/transfer_proof.rs @@ -79,7 +79,10 @@ impl NetworkBehaviourEventProcess> for B debug!("Received Transfer Proof"); self.events.push_back(OutEvent::Msg(*msg)); // Send back empty response so that the request/response protocol completes. - let _ = self.rr.send_response(channel, Response::TransferProof); + let _ = self + .rr + .send_response(channel, Response::TransferProof) + .map_err(|err| error!("Failed to send message 3: {:?}", err)); } } RequestResponseEvent::Message { From f1c07fbb6d0324e05c5be8bc6812e2bc0d33d238 Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Fri, 29 Jan 2021 16:11:09 +1100 Subject: [PATCH 2/2] Remove incorrect todo --- swap/src/config.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/swap/src/config.rs b/swap/src/config.rs index 1f8f9e59..286f0309 100644 --- a/swap/src/config.rs +++ b/swap/src/config.rs @@ -16,7 +16,6 @@ pub struct Config { pub monero_network: monero::Network, } -// TODO: This trait is not needed pub trait GetConfig { fn get_config() -> Config; }