From e3eeef4301e8687f3629eeb14ba75abe46159dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Wed, 22 Mar 2023 15:31:23 +0000 Subject: [PATCH] removed old deprecated 'extended_packet_size' --- .../client-core/src/client/base_client/mod.rs | 7 +---- common/client-core/src/config/mod.rs | 29 +------------------ .../src/config/old_config_v1_1_13.rs | 29 +++++++++++++++---- 3 files changed, 26 insertions(+), 39 deletions(-) diff --git a/common/client-core/src/client/base_client/mod.rs b/common/client-core/src/client/base_client/mod.rs index 935e5f1f09..c245028de2 100644 --- a/common/client-core/src/client/base_client/mod.rs +++ b/common/client-core/src/client/base_client/mod.rs @@ -235,7 +235,7 @@ where ) { info!("Starting loop cover traffic stream..."); - let mut stream = LoopCoverTrafficStream::new( + let stream = LoopCoverTrafficStream::new( ack_key, debug_config.acknowledgements.average_ack_delay, debug_config.traffic.average_packet_delay, @@ -245,11 +245,6 @@ where topology_accessor, ); - if let Some(size) = debug_config.traffic.use_extended_packet_size { - log::debug!("Setting extended packet size: {:?}", size); - stream.set_custom_packet_size(size.into()); - } - stream.start_with_shutdown(shutdown); } diff --git a/common/client-core/src/config/mod.rs b/common/client-core/src/config/mod.rs index 4f09676d3b..ebcd604759 100644 --- a/common/client-core/src/config/mod.rs +++ b/common/client-core/src/config/mod.rs @@ -363,10 +363,6 @@ impl Config { self.debug.traffic.disable_main_poisson_packet_distribution } - pub fn get_use_extended_packet_size(&self) -> Option { - self.debug.traffic.use_extended_packet_size - } - pub fn get_minimum_reply_surb_storage_threshold(&self) -> usize { self.debug.reply_surbs.minimum_reply_surb_storage_threshold } @@ -603,7 +599,7 @@ impl Client { pub struct Logging {} #[derive(Debug, Clone, Copy, Deserialize, PartialEq, Serialize)] -#[serde(default, deny_unknown_fields)] +#[serde(default)] pub struct Traffic { /// The parameter of Poisson distribution determining how long, on average, /// sent packet is going to be delayed at any given mix node. @@ -631,10 +627,6 @@ pub struct Traffic { /// Note that its use decreases overall anonymity. /// Do not set it it unless you understand the consequences of that change. pub secondary_packet_size: Option, - - /// Controls whether the sent sphinx packet use a NON-DEFAULT bigger size. - #[deprecated] - pub use_extended_packet_size: Option, } impl Traffic { @@ -658,7 +650,6 @@ impl Default for Traffic { disable_main_poisson_packet_distribution: false, primary_packet_size: PacketSize::RegularPacket, secondary_packet_size: None, - use_extended_packet_size: None, } } } @@ -849,14 +840,6 @@ impl DebugConfig { } } -#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)] -#[serde(rename_all = "lowercase")] -pub enum ExtendedPacketSize { - Extended8, - Extended16, - Extended32, -} - // it could be derived, sure, but I'd rather have an explicit implementation in case we had to change // something manually at some point #[allow(clippy::derivable_impls)] @@ -872,13 +855,3 @@ impl Default for DebugConfig { } } } - -impl From for PacketSize { - fn from(size: ExtendedPacketSize) -> PacketSize { - match size { - ExtendedPacketSize::Extended8 => PacketSize::ExtendedPacket8, - ExtendedPacketSize::Extended16 => PacketSize::ExtendedPacket16, - ExtendedPacketSize::Extended32 => PacketSize::ExtendedPacket32, - } - } -} diff --git a/common/client-core/src/config/old_config_v1_1_13.rs b/common/client-core/src/config/old_config_v1_1_13.rs index f9065cef5d..b33e146a6a 100644 --- a/common/client-core/src/config/old_config_v1_1_13.rs +++ b/common/client-core/src/config/old_config_v1_1_13.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::config::{ - Acknowledgements, Client, Config, CoverTraffic, DebugConfig, ExtendedPacketSize, - GatewayConnection, Logging, ReplySurbs, Topology, Traffic, DEFAULT_ACK_WAIT_ADDITION, - DEFAULT_ACK_WAIT_MULTIPLIER, DEFAULT_AVERAGE_PACKET_DELAY, DEFAULT_GATEWAY_RESPONSE_TIMEOUT, + Acknowledgements, Client, Config, CoverTraffic, DebugConfig, GatewayConnection, Logging, + ReplySurbs, Topology, Traffic, DEFAULT_ACK_WAIT_ADDITION, DEFAULT_ACK_WAIT_MULTIPLIER, + DEFAULT_AVERAGE_PACKET_DELAY, DEFAULT_GATEWAY_RESPONSE_TIMEOUT, DEFAULT_LOOP_COVER_STREAM_AVERAGE_DELAY, DEFAULT_MAXIMUM_ALLOWED_SURB_REQUEST_SIZE, DEFAULT_MAXIMUM_REPLY_KEY_AGE, DEFAULT_MAXIMUM_REPLY_SURB_AGE, DEFAULT_MAXIMUM_REPLY_SURB_DROP_WAITING_PERIOD, DEFAULT_MAXIMUM_REPLY_SURB_REQUEST_SIZE, @@ -14,10 +14,29 @@ use crate::config::{ DEFAULT_TOPOLOGY_REFRESH_RATE, DEFAULT_TOPOLOGY_RESOLUTION_TIMEOUT, }; use nym_config::NymConfig; +use nym_sphinx::params::PacketSize; use serde::{Deserialize, Serialize}; use std::marker::PhantomData; use std::time::Duration; +#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)] +#[serde(rename_all = "lowercase")] +pub enum ExtendedPacketSize { + Extended8, + Extended16, + Extended32, +} + +impl From for PacketSize { + fn from(size: ExtendedPacketSize) -> PacketSize { + match size { + ExtendedPacketSize::Extended8 => PacketSize::ExtendedPacket8, + ExtendedPacketSize::Extended16 => PacketSize::ExtendedPacket16, + ExtendedPacketSize::Extended32 => PacketSize::ExtendedPacket32, + } + } +} + #[derive(Debug, Clone, Deserialize, PartialEq, Serialize)] #[serde(deny_unknown_fields)] pub struct OldConfigV1_1_13 { @@ -104,8 +123,8 @@ impl From for DebugConfig { message_sending_average_delay: value.message_sending_average_delay, disable_main_poisson_packet_distribution: value .disable_main_poisson_packet_distribution, - use_extended_packet_size: value.use_extended_packet_size, - ..Traffic::default() + primary_packet_size: PacketSize::RegularPacket, + secondary_packet_size: value.use_extended_packet_size.map(Into::into), }, cover_traffic: CoverTraffic { loop_cover_traffic_average_delay: value.loop_cover_traffic_average_delay,