Add default for `MixnetClientConfig::connection_pool_size` (#462)

mixnet/client/Cargo.toml

@@ -16,3 +16,6 @@ mixnet-topology = { path = "../topology" }
 mixnet-util = { path = "../util" }
 futures = "0.3.28"
 thiserror = "1"
+
+[dev-dependencies]
+serde_yaml = "0.9.25"

mixnet/client/src/config.rs

@@ -6,10 +6,11 @@ use serde::{Deserialize, Serialize};
 
 use crate::{receiver::Receiver, MessageStream, MixnetClientError};
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub struct MixnetClientConfig {
     pub mode: MixnetClientMode,
     pub topology: MixnetTopology,
+    #[serde(default = "MixnetClientConfig::default_connection_pool_size")]
     pub connection_pool_size: usize,
     #[serde(default = "MixnetClientConfig::default_max_retries")]
     pub max_retries: usize,
@@ -23,14 +24,26 @@ impl MixnetClientConfig {
         Self {
             mode,
             topology,
-            connection_pool_size: 256,
-            max_retries: 3,
-            retry_delay: std::time::Duration::from_secs(5),
-        }
+            connection_pool_size: Self::default_connection_pool_size(),
+            max_retries: Self::default_max_retries(),
+            retry_delay: Self::default_retry_delay(),
         }
     }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+    const fn default_connection_pool_size() -> usize {
+        256
+    }
+
+    const fn default_max_retries() -> usize {
+        3
+    }
+
+    const fn default_retry_delay() -> Duration {
+        Duration::from_secs(5)
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub enum MixnetClientMode {
     Sender,
     SenderReceiver(SocketAddr),
@@ -47,12 +60,26 @@ impl MixnetClientMode {
     }
 }
 
-impl MixnetClientConfig {
-    const fn default_max_retries() -> usize {
-        3
-    }
+#[cfg(test)]
+mod tests {
+    use mixnet_topology::MixnetTopology;
 
-    const fn default_retry_delay() -> Duration {
-        Duration::from_secs(5)
+    use crate::{MixnetClientConfig, MixnetClientMode};
+
+    #[test]
+    fn default_config_serde() {
+        let yaml = "
+            mode: Sender
+            topology:
+              layers: []
+        ";
+        let conf: MixnetClientConfig = serde_yaml::from_str(yaml).unwrap();
+        assert_eq!(
+            conf,
+            MixnetClientConfig::new(
+                MixnetClientMode::Sender,
+                MixnetTopology { layers: Vec::new() }
+            )
+        );
     }
 }

mixnet/topology/src/lib.rs

@@ -9,17 +9,17 @@ pub type MixnetNodeId = [u8; PUBLIC_KEY_SIZE];
 
 pub type Result<T> = core::result::Result<T, NymNodeRoutingAddressError>;
 
-#[derive(Serialize, Deserialize, Clone, Debug, Default)]
+#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq)]
 pub struct MixnetTopology {
     pub layers: Vec<Layer>,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub struct Layer {
     pub nodes: Vec<Node>,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub struct Node {
     #[serde(with = "addr_serde")]
     pub address: SocketAddr,