From ecfaa8fb8b689730e13adfb4b1326586eb0db548 Mon Sep 17 00:00:00 2001
From: Youngjoon Lee <5462944+youngjoon-lee@users.noreply.github.com>
Date: Fri, 29 Nov 2024 10:24:32 +0900
Subject: [PATCH] remove default for settings

---
 nomos-mix/core/src/conn_maintenance.rs              | 13 -------------
 .../data-availability/tests/src/common.rs           | 10 ++++++++--
 tests/src/topology/configs/mix.rs                   | 12 +++++++++---
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/nomos-mix/core/src/conn_maintenance.rs b/nomos-mix/core/src/conn_maintenance.rs
index 28eef0eb..506bd9c5 100644
--- a/nomos-mix/core/src/conn_maintenance.rs
+++ b/nomos-mix/core/src/conn_maintenance.rs
@@ -9,7 +9,6 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize)]
 pub struct ConnectionMaintenanceSettings {
-    /// The time window
     pub time_window: Duration,
     /// The number of effective (data or cover) messages that a peer is expected to send in a given time window.
     /// If the measured count is greater than (expected * (1 + tolerance)), the peer is considered malicious.
@@ -23,18 +22,6 @@ pub struct ConnectionMaintenanceSettings {
     pub drop_message_tolerance: f32,
 }
 
-impl Default for ConnectionMaintenanceSettings {
-    fn default() -> Self {
-        Self {
-            time_window: Duration::from_secs(3600),
-            expected_effective_messages: 0.0,
-            effective_message_tolerance: 0.0,
-            expected_drop_messages: 0.0,
-            drop_message_tolerance: 0.0,
-        }
-    }
-}
-
 pub struct ConnectionMaintenance<Peer> {
     settings: ConnectionMaintenanceSettings,
     meters: HashMap<Peer, ConnectionMeter>,
diff --git a/nomos-services/data-availability/tests/src/common.rs b/nomos-services/data-availability/tests/src/common.rs
index 8c5afead..840b5840 100644
--- a/nomos-services/data-availability/tests/src/common.rs
+++ b/nomos-services/data-availability/tests/src/common.rs
@@ -1,10 +1,10 @@
 use cryptarchia_consensus::LeaderConfig;
 // std
 use nomos_da_network_service::backends::libp2p::common::DaNetworkBackendSettings;
-use nomos_mix::membership::Node;
 use nomos_mix::message_blend::{
     CryptographicProcessorSettings, MessageBlendSettings, TemporalSchedulerSettings,
 };
+use nomos_mix::{conn_maintenance::ConnectionMaintenanceSettings, membership::Node};
 use nomos_mix_message::{sphinx::SphinxMessage, MixMessage};
 use std::path::PathBuf;
 use std::time::Duration;
@@ -330,7 +330,13 @@ pub fn new_mix_configs(listening_addresses: Vec<Multiaddr>) -> Vec<TestMixSettin
                     listening_address: listening_address.clone(),
                     node_key: ed25519::SecretKey::generate(),
                     peering_degree: 1,
-                    conn_maintenance: Default::default(),
+                    conn_maintenance: ConnectionMaintenanceSettings {
+                        time_window: Duration::from_secs(600),
+                        expected_effective_messages: 600.0,
+                        effective_message_tolerance: 0.1,
+                        expected_drop_messages: 0.0,
+                        drop_message_tolerance: 0.0,
+                    },
                 },
                 x25519_dalek::StaticSecret::random(),
             )
diff --git a/tests/src/topology/configs/mix.rs b/tests/src/topology/configs/mix.rs
index 2d6492dc..c60a26a4 100644
--- a/tests/src/topology/configs/mix.rs
+++ b/tests/src/topology/configs/mix.rs
@@ -1,7 +1,7 @@
-use std::str::FromStr;
+use std::{str::FromStr, time::Duration};
 
 use nomos_libp2p::{ed25519, Multiaddr};
-use nomos_mix::membership::Node;
+use nomos_mix::{conn_maintenance::ConnectionMaintenanceSettings, membership::Node};
 use nomos_mix_message::{sphinx::SphinxMessage, MixMessage};
 use nomos_mix_service::backends::libp2p::Libp2pMixBackendSettings;
 
@@ -31,7 +31,13 @@ pub fn create_mix_configs(ids: &[[u8; 32]]) -> Vec<GeneralMixConfig> {
                     .unwrap(),
                     node_key,
                     peering_degree: 1,
-                    conn_maintenance: Default::default(),
+                    conn_maintenance: ConnectionMaintenanceSettings {
+                        time_window: Duration::from_secs(600),
+                        expected_effective_messages: 600.0,
+                        effective_message_tolerance: 0.1,
+                        expected_drop_messages: 0.0,
+                        drop_message_tolerance: 0.0,
+                    },
                 },
                 private_key: x25519_dalek::StaticSecret::random(),
                 membership: Vec::new(),