1
0
mirror of synced 2025-02-13 00:06:33 +00:00

remove default for settings

This commit is contained in:
Youngjoon Lee 2024-11-29 10:24:32 +09:00
parent bb9817f16d
commit ecfaa8fb8b
No known key found for this signature in database
GPG Key ID: 303963A54A81DD4D
3 changed files with 17 additions and 18 deletions

View File

@ -9,7 +9,6 @@ use serde::{Deserialize, Serialize};
#[derive(Clone, Copy, Debug, Serialize, Deserialize)] #[derive(Clone, Copy, Debug, Serialize, Deserialize)]
pub struct ConnectionMaintenanceSettings { pub struct ConnectionMaintenanceSettings {
/// The time window
pub time_window: Duration, pub time_window: Duration,
/// The number of effective (data or cover) messages that a peer is expected to send in a given time window. /// 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. /// 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, 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> { pub struct ConnectionMaintenance<Peer> {
settings: ConnectionMaintenanceSettings, settings: ConnectionMaintenanceSettings,
meters: HashMap<Peer, ConnectionMeter>, meters: HashMap<Peer, ConnectionMeter>,

View File

@ -1,10 +1,10 @@
use cryptarchia_consensus::LeaderConfig; use cryptarchia_consensus::LeaderConfig;
// std // std
use nomos_da_network_service::backends::libp2p::common::DaNetworkBackendSettings; use nomos_da_network_service::backends::libp2p::common::DaNetworkBackendSettings;
use nomos_mix::membership::Node;
use nomos_mix::message_blend::{ use nomos_mix::message_blend::{
CryptographicProcessorSettings, MessageBlendSettings, TemporalSchedulerSettings, CryptographicProcessorSettings, MessageBlendSettings, TemporalSchedulerSettings,
}; };
use nomos_mix::{conn_maintenance::ConnectionMaintenanceSettings, membership::Node};
use nomos_mix_message::{sphinx::SphinxMessage, MixMessage}; use nomos_mix_message::{sphinx::SphinxMessage, MixMessage};
use std::path::PathBuf; use std::path::PathBuf;
use std::time::Duration; use std::time::Duration;
@ -330,7 +330,13 @@ pub fn new_mix_configs(listening_addresses: Vec<Multiaddr>) -> Vec<TestMixSettin
listening_address: listening_address.clone(), listening_address: listening_address.clone(),
node_key: ed25519::SecretKey::generate(), node_key: ed25519::SecretKey::generate(),
peering_degree: 1, 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(), x25519_dalek::StaticSecret::random(),
) )

View File

@ -1,7 +1,7 @@
use std::str::FromStr; use std::{str::FromStr, time::Duration};
use nomos_libp2p::{ed25519, Multiaddr}; 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_message::{sphinx::SphinxMessage, MixMessage};
use nomos_mix_service::backends::libp2p::Libp2pMixBackendSettings; use nomos_mix_service::backends::libp2p::Libp2pMixBackendSettings;
@ -31,7 +31,13 @@ pub fn create_mix_configs(ids: &[[u8; 32]]) -> Vec<GeneralMixConfig> {
.unwrap(), .unwrap(),
node_key, node_key,
peering_degree: 1, 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(), private_key: x25519_dalek::StaticSecret::random(),
membership: Vec::new(), membership: Vec::new(),