Change measurement noise to f64 instead of NtpDuration

Prevents rounding errors when using from_seconds, especially for small values (<1e-9)
pendulum-project · Jan 10, 2025 · dac1cdb · dac1cdb
1 parent 92e6dff
commit dac1cdb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/ntpd/src/daemon/config/ntp_source.rs b/ntpd/src/daemon/config/ntp_source.rs
@@ -7,7 +7,6 @@ use std::{
 };
 
 use ntp_proto::tls_utils::Certificate;
-use ntp_proto::NtpDuration;
 #[cfg(feature = "unstable_ntpv5")]
 use ntp_proto::NtpVersion;
 use serde::{de, Deserialize, Deserializer};
@@ -114,14 +113,14 @@ pub struct NtsPoolSourceConfig {
 #[serde(deny_unknown_fields)]
 pub struct SockSourceConfig {
     pub path: PathBuf,
-    pub measurement_noise_estimate: NtpDuration,
+    pub measurement_noise_estimate: f64,
 }
 
 #[derive(Deserialize, Debug, PartialEq, Clone)]
 #[serde(deny_unknown_fields)]
 pub struct PpsSourceConfig {
     pub path: PathBuf,
-    pub measurement_noise_estimate: NtpDuration,
+    pub measurement_noise_estimate: f64,
     #[serde(default = "default_period")]
     pub period: f64,
 }

diff --git a/ntpd/src/daemon/spawn/pps.rs b/ntpd/src/daemon/spawn/pps.rs
@@ -37,7 +37,7 @@ impl Spawner for PpsSpawner {
                 SpawnAction::Create(SourceCreateParameters::Pps(PpsSourceCreateParameters {
                     id: SourceId::new(),
                     path: self.config.path.clone(),
-                    noise_estimate: self.config.measurement_noise_estimate.to_seconds(),
+                    noise_estimate: self.config.measurement_noise_estimate,
                     period: self.config.period,
                 })),
             ))
@@ -75,7 +75,6 @@ impl Spawner for PpsSpawner {
 
 #[cfg(test)]
 mod tests {
-    use ntp_proto::NtpDuration;
     use tokio::sync::mpsc;
 
     use crate::{
@@ -93,7 +92,7 @@ mod tests {
         let noise_estimate = 1e-6;
         let mut spawner = PpsSpawner::new(PpsSourceConfig {
             path: socket_path.clone(),
-            measurement_noise_estimate: NtpDuration::from_seconds(noise_estimate),
+            measurement_noise_estimate: noise_estimate,
             period: 1.,
         });
         let spawner_id = spawner.get_id();

diff --git a/ntpd/src/daemon/spawn/sock.rs b/ntpd/src/daemon/spawn/sock.rs
@@ -37,7 +37,7 @@ impl Spawner for SockSpawner {
                 SpawnAction::Create(SourceCreateParameters::Sock(SockSourceCreateParameters {
                     id: SourceId::new(),
                     path: self.config.path.clone(),
-                    noise_estimate: self.config.measurement_noise_estimate.to_seconds(),
+                    noise_estimate: self.config.measurement_noise_estimate,
                 })),
             ))
             .await?;
@@ -74,7 +74,6 @@ impl Spawner for SockSpawner {
 
 #[cfg(test)]
 mod tests {
-    use ntp_proto::NtpDuration;
     use tokio::sync::mpsc;
 
     use crate::{
@@ -92,7 +91,7 @@ mod tests {
         let noise_estimate = 1e-6;
         let mut spawner = SockSpawner::new(SockSourceConfig {
             path: socket_path.clone(),
-            measurement_noise_estimate: NtpDuration::from_seconds(noise_estimate),
+            measurement_noise_estimate: noise_estimate,
         });
         let spawner_id = spawner.get_id();
         let (action_tx, mut action_rx) = mpsc::channel(MESSAGE_BUFFER_SIZE);