refactor: implement Default for Configuration sections

torrust · May 9, 2024 · 69d7939 · 69d7939
1 parent caae725
commit 69d7939
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/packages/configuration/src/v1/health_check_api.rs b/packages/configuration/src/v1/health_check_api.rs
@@ -11,3 +11,11 @@ pub struct HealthCheckApi {
     /// system to choose a random port, use port `0`.
     pub bind_address: String,
 }
+
+impl Default for HealthCheckApi {
+    fn default() -> Self {
+        Self {
+            bind_address: String::from("127.0.0.1:1313"),
+        }
+    }
+}
diff --git a/packages/configuration/src/v1/http_tracker.rs b/packages/configuration/src/v1/http_tracker.rs
@@ -21,3 +21,15 @@ pub struct HttpTracker {
     #[serde_as(as = "NoneAsEmptyString")]
     pub ssl_key_path: Option<String>,
 }
+
+impl Default for HttpTracker {
+    fn default() -> Self {
+        Self {
+            enabled: false,
+            bind_address: String::from("0.0.0.0:7070"),
+            ssl_enabled: false,
+            ssl_cert_path: None,
+            ssl_key_path: None,
+        }
+    }
+}
diff --git a/packages/configuration/src/v1/mod.rs b/packages/configuration/src/v1/mod.rs
@@ -346,21 +346,10 @@ impl Default for Configuration {
             udp_trackers: Vec::new(),
             http_trackers: Vec::new(),
             http_api: HttpApi::default(),
-            health_check_api: HealthCheckApi {
-                bind_address: String::from("127.0.0.1:1313"),
-            },
+            health_check_api: HealthCheckApi::default(),
         };
-        configuration.udp_trackers.push(UdpTracker {
-            enabled: false,
-            bind_address: String::from("0.0.0.0:6969"),
-        });
-        configuration.http_trackers.push(HttpTracker {
-            enabled: false,
-            bind_address: String::from("0.0.0.0:7070"),
-            ssl_enabled: false,
-            ssl_cert_path: None,
-            ssl_key_path: None,
-        });
+        configuration.udp_trackers.push(UdpTracker::default());
+        configuration.http_trackers.push(HttpTracker::default());
         configuration
     }
 }

diff --git a/packages/configuration/src/v1/udp_tracker.rs b/packages/configuration/src/v1/udp_tracker.rs
@@ -10,3 +10,11 @@ pub struct UdpTracker {
     /// system to choose a random port, use port `0`.
     pub bind_address: String,
 }
+impl Default for UdpTracker {
+    fn default() -> Self {
+        Self {
+            enabled: false,
+            bind_address: String::from("0.0.0.0:6969"),
+        }
+    }
+}