From c0044274f765c7bee749cbcf90e3bcd15b0cf1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Mon, 10 Oct 2022 18:32:09 +0200 Subject: [PATCH] WIP --- .../acknowledgement_control/acknowledgement_listener.rs | 2 +- .../real_messages_control/acknowledgement_control/mod.rs | 3 ++- clients/client-core/src/client/received_buffer.rs | 2 +- envs/qa.env | 2 +- .../src/node/mixnet_handling/receiver/connection_handler.rs | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) 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 2f9a6053ec..9b285d8444 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 @@ -33,7 +33,7 @@ impl AcknowledgementListener { } async fn on_ack(&mut self, ack_content: Vec) { - debug!("Received an ack"); + trace!("Received an ack"); let frag_id = match recover_identifier(&self.ack_key, &ack_content) .map(FragmentIdentifier::try_from_bytes) { diff --git a/clients/client-core/src/client/real_messages_control/acknowledgement_control/mod.rs b/clients/client-core/src/client/real_messages_control/acknowledgement_control/mod.rs index c946716091..27aa11d87d 100644 --- a/clients/client-core/src/client/real_messages_control/acknowledgement_control/mod.rs +++ b/clients/client-core/src/client/real_messages_control/acknowledgement_control/mod.rs @@ -187,7 +187,8 @@ where config.average_packet_delay, config.average_ack_delay, ) - .with_custom_real_message_packet_size(config.packet_size); + //.with_custom_real_message_packet_size(config.packet_size); + .with_custom_real_message_packet_size(nymsphinx::params::PacketSize::ExtendedPacket); // will listen for any acks coming from the network let acknowledgement_listener = AcknowledgementListener::new( diff --git a/clients/client-core/src/client/received_buffer.rs b/clients/client-core/src/client/received_buffer.rs index 9830f0a869..fa61b9b9a0 100644 --- a/clients/client-core/src/client/received_buffer.rs +++ b/clients/client-core/src/client/received_buffer.rs @@ -208,7 +208,7 @@ impl ReceivedMessagesBuffer { } async fn handle_new_received(&mut self, msgs: Vec>) { - debug!( + trace!( "Processing {:?} new message that might get added to the buffer!", msgs.len() ); diff --git a/envs/qa.env b/envs/qa.env index 842fb54c4d..0e791db172 100644 --- a/envs/qa.env +++ b/envs/qa.env @@ -9,7 +9,7 @@ MIX_DENOM_DISPLAY=nym STAKE_DENOM=unyx STAKE_DENOM_DISPLAY=nyx DENOMS_EXPONENT=6 -MIXNET_CONTRACT_ADDRESS=n1suhgf5svhu4usrurvxzlgn54ksxmn8gljarjtxqnapv8kjnp4nrsd3qaep +MIXNET_CONTRACT_ADDRESS=n1rjzps6qrmdqmf0xz4cn4x4rcmqeqzq6hnzqg4wcvd0r2lyasdq5sepn5s8 VESTING_CONTRACT_ADDRESS=n1xr3rq8yvd7qplsw5yx90ftsr2zdhg4e9z60h5duusgxpv72hud3sjkxkav BANDWIDTH_CLAIM_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0 COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n1ghd753shjuwexxywmgs4xz7x2q732vcn7ty4yw diff --git a/gateway/src/node/mixnet_handling/receiver/connection_handler.rs b/gateway/src/node/mixnet_handling/receiver/connection_handler.rs index 8dd85d9ded..d11d02bbdf 100644 --- a/gateway/src/node/mixnet_handling/receiver/connection_handler.rs +++ b/gateway/src/node/mixnet_handling/receiver/connection_handler.rs @@ -143,7 +143,7 @@ impl ConnectionHandler { .await { Err(err) => error!("Failed to store client data - {}", err), - Ok(_) => trace!("Stored packet for {}", client_address), + Ok(_) => debug!("Stored packet for {}", client_address), }, Ok(_) => trace!("Pushed received packet to {}", client_address), }