SyntheticBird/cuprate-hinto-janai
1
0
Fork 0
mirror of https://github.com/hinto-janai/cuprate.git synced 2025-01-10 12:54:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
hinto.janai 2024-09-19 17:23:50 -04:00
parent 719f4cd64d
commit 077db2f951
No known key found for this signature in database
GPG key ID: D47CE05FA175A499
5 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
p2p/p2p-core/src/client.rs
View file

@ -169,9 +169,8 @@ impl<Z: NetworkZone> Service<PeerRequest> for Client<Z> {
TrySendError::Closed(req) | TrySendError::Full(req) => { TrySendError::Closed(req) | TrySendError::Full(req) => {
self.set_err(PeerError::ClientChannelClosed); self.set_err(PeerError::ClientChannelClosed);
let _unused = req let resp = Err(PeerError::ClientChannelClosed.into());
.response_channel drop(req.response_channel.send(resp));
.send(Err(PeerError::ClientChannelClosed.into()));
} }
} }
} }
@ -216,7 +215,7 @@ where
tracing::debug!("Sending back response"); tracing::debug!("Sending back response");
let _unused = req.response_channel.send(Ok(res)); drop(req.response_channel.send(Ok(res)));
} }
} }
.instrument(task_span), .instrument(task_span),

17
p2p/p2p-core/src/client/connection.rs
View file

@ -174,14 +174,13 @@ where
if let Err(e) = res { if let Err(e) = res {
// can't clone the error so turn it to a string first, hacky but oh well. // can't clone the error so turn it to a string first, hacky but oh well.
let err_str = e.to_string(); let err_str = e.to_string();
let _unused = req.response_channel.send(Err(err_str.into())); drop(req.response_channel.send(Err(err_str.into())));
return Err(e); return Err(e);
} }
// We still need to respond even if the response is this. // We still need to respond even if the response is this.
let _unused = req let resp = Ok(PeerResponse::Protocol(ProtocolResponse::NA));
.response_channel drop(req.response_channel.send(resp));
.send(Ok(PeerResponse::Protocol(ProtocolResponse::NA)));
Ok(()) Ok(())
} }
@ -224,9 +223,11 @@ where
panic!("Not in correct state, can't receive response!") panic!("Not in correct state, can't receive response!")
}; };
let _unused = tx.send(Ok(mes let resp = Ok(mes
.try_into() .try_into()
.map_err(|_| PeerError::PeerSentInvalidMessage)?)); .map_err(|_| PeerError::PeerSentInvalidMessage)?);
drop(tx.send(resp));
self.request_timeout = None; self.request_timeout = None;
@ -366,11 +367,11 @@ where
if let State::WaitingForResponse { tx, .. } = if let State::WaitingForResponse { tx, .. } =
std::mem::replace(&mut self.state, State::WaitingForRequest) std::mem::replace(&mut self.state, State::WaitingForRequest)
{ {
let _unused = tx.send(Err(err_str.clone().into())); drop(tx.send(Err(err_str.clone().into())));
} }
while let Ok(req) = client_rx.try_recv() { while let Ok(req) = client_rx.try_recv() {
let _unused = req.response_channel.send(Err(err_str.clone().into())); drop(req.response_channel.send(Err(err_str.clone().into())));
} }
self.connection_guard.connection_closed(); self.connection_guard.connection_closed();

4
p2p/p2p-core/src/tests.rs
View file

@ -1,4 +0,0 @@
mod fragmented_handshake;
mod handles;
mod handshake;
mod sending_receiving;

2
p2p/p2p-core/tests/fragmented_handshake.rs
View file

@ -187,7 +187,7 @@ async fn fragmented_handshake_monerod_to_cuprate() {
let next_connection_fut = timeout(Duration::from_secs(30), listener.next()); let next_connection_fut = timeout(Duration::from_secs(30), listener.next());
if let Some(Ok((addr, stream, sink))) = next_connection_fut.await.unwrap() { if let Some(Ok((addr, stream, sink))) = next_connection_fut.await.unwrap() {
let _unused = handshaker handshaker
.ready() .ready()
.await .await
.unwrap() .unwrap()

2
p2p/p2p-core/tests/handshake.rs
View file

@ -149,7 +149,7 @@ async fn handshake_monerod_to_cuprate() {
let next_connection_fut = timeout(Duration::from_secs(30), listener.next()); let next_connection_fut = timeout(Duration::from_secs(30), listener.next());
if let Some(Ok((addr, stream, sink))) = next_connection_fut.await.unwrap() { if let Some(Ok((addr, stream, sink))) = next_connection_fut.await.unwrap() {
let _unused = handshaker handshaker
.ready() .ready()
.await .await
.unwrap() .unwrap()