diff --git a/clients/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs b/clients/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs index 216447afb8..2be5f58f41 100644 --- a/clients/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs +++ b/clients/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs @@ -10,7 +10,6 @@ use nym_sphinx::{ chunking::fragment::{FragmentIdentifier, COVER_FRAG_ID}, }; use std::sync::Arc; -use std::time::{SystemTime, UNIX_EPOCH}; /// Module responsible for listening for any data resembling acknowledgements from the network /// and firing actions to remove them from the 'Pending' state. @@ -48,17 +47,11 @@ impl AcknowledgementListener { // if we received an ack for cover message or a reply there will be nothing to remove, // because nothing was inserted in the first place if frag_id == COVER_FRAG_ID { - println!("cover ack"); trace!("Received an ack for a cover message - no need to do anything"); return; } trace!("Received {} from the mix network", frag_id); - let time = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_millis(); - println!("real ack : /{:?}/{}", frag_id, time); self.action_sender .unbounded_send(Action::new_remove(frag_id)) diff --git a/clients/client-core/src/client/real_messages_control/real_traffic_stream.rs b/clients/client-core/src/client/real_messages_control/real_traffic_stream.rs index 9ac062b9a5..8c8f18503a 100644 --- a/clients/client-core/src/client/real_messages_control/real_traffic_stream.rs +++ b/clients/client-core/src/client/real_messages_control/real_traffic_stream.rs @@ -562,4 +562,4 @@ where fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { self.poll_next_message(cx) } -} \ No newline at end of file +} diff --git a/clients/client-core/src/client/received_buffer.rs b/clients/client-core/src/client/received_buffer.rs index 5d125165cd..7d7ffdb021 100644 --- a/clients/client-core/src/client/received_buffer.rs +++ b/clients/client-core/src/client/received_buffer.rs @@ -20,7 +20,6 @@ use nym_sphinx::params::ReplySurbKeyDigestAlgorithm; use nym_sphinx::receiver::{MessageReceiver, MessageRecoveryError, ReconstructedMessage}; use std::collections::HashSet; use std::sync::Arc; -use std::time::{SystemTime, UNIX_EPOCH}; // Buffer Requests to say "hey, send any reconstructed messages to this channel" // or to say "hey, I'm going offline, don't send anything more to me. Just buffer them instead" @@ -50,7 +49,6 @@ impl ReceivedMessagesBufferInner { fn recover_from_fragment(&mut self, fragment_data: &[u8]) -> Option { if nym_sphinx::cover::is_cover(fragment_data) { trace!("The message was a loop cover message! Skipping it"); - println!("Cover received"); return None; } @@ -61,12 +59,6 @@ impl ReceivedMessagesBufferInner { } Ok(frag) => frag, }; - - let time = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_millis(); - println!("real received : _{:?}_{}_{}", &fragment.id(),&fragment.current_fragment(),time); if self.recently_reconstructed.contains(&fragment.id()) { debug!("Received a chunk of already re-assembled message ({:?})! It probably got here because the ack got lost", fragment.id()); diff --git a/clients/socks5/src/socks/client.rs b/clients/socks5/src/socks/client.rs index 8abf641222..25f4e2d568 100644 --- a/clients/socks5/src/socks/client.rs +++ b/clients/socks5/src/socks/client.rs @@ -26,7 +26,6 @@ use std::net::SocketAddr; use std::pin::Pin; use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, ReadBuf}; use tokio::{self, net::TcpStream}; -use std::time::{SystemTime, UNIX_EPOCH}; #[pin_project(project = StateProject)] enum StreamState { @@ -485,23 +484,11 @@ impl SocksClient { remote_address.clone(), self.connection_id ); - let time = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_millis(); - - println!("Download started_{}",time); - println!("Connection id {:?}", self.connection_id); self.run_proxy(mix_receiver, remote_address.clone()).await; info!( "Proxy for {} is finished (id: {})", remote_address, self.connection_id ); - let time2 = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_millis(); - println!("Download ended_{}",time2); } SocksCommand::Bind => unimplemented!(), // not handled diff --git a/common/nymsphinx/params/src/packet_sizes.rs b/common/nymsphinx/params/src/packet_sizes.rs index d22e2fa6e0..0c49d798a6 100644 --- a/common/nymsphinx/params/src/packet_sizes.rs +++ b/common/nymsphinx/params/src/packet_sizes.rs @@ -20,7 +20,6 @@ const ACK_PACKET_SIZE: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE + ACK_IV_SIZE const EXTENDED_PACKET_SIZE_8: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE + 8 * 1024; const EXTENDED_PACKET_SIZE_16: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE + 16 * 1024; const EXTENDED_PACKET_SIZE_32: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE + 32 * 1024; - const EXTENDED_PACKET_SIZE_10: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE + 10 * 1024; const EXTENDED_PACKET_SIZE_15: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE + 15 * 1024; const EXTENDED_PACKET_SIZE_20: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE + 20 * 1024; @@ -233,4 +232,3 @@ mod tests { assert_eq!(iv_size, ACK_IV_SIZE); } } - diff --git a/common/nymsphinx/params/src/packet_version.rs b/common/nymsphinx/params/src/packet_version.rs index 12f1666811..96152f426d 100644 --- a/common/nymsphinx/params/src/packet_version.rs +++ b/common/nymsphinx/params/src/packet_version.rs @@ -67,4 +67,3 @@ impl Default for PacketVersion { PacketVersion::Versioned(CURRENT_PACKET_VERSION_NUMBER) } } -