Refactor

Author: ryuichiueda

src/core/database.rs

@@ -4,14 +4,14 @@
 mod data;
 
 use self::data::Data;
-use self::data::epochrealtime::EpochRealtime;
-use self::data::epochseconds::EpochSeconds;
+use self::data::epochtime::EpochTime;
 use self::data::random::RandomVar;
 use self::data::seconds::Seconds;
 use self::data::srandom::SRandomVar;
 use self::data::single::SingleData;
 use crate::error::exec::ExecError;
 use crate::elements::command::function_def::FunctionDefinition;
+use crate::utils::clock;
 use std::collections::{HashMap, HashSet};
 use std::env;
 
@@ -33,8 +33,10 @@ impl DataBase {
         ans.params[0].insert("RANDOM".to_string(), Box::new(RandomVar::new()));
         ans.params[0].insert("SRANDOM".to_string(), Box::new(SRandomVar::new()));
         ans.params[0].insert("SECONDS".to_string(), Box::new(Seconds::new()));
-        ans.params[0].insert("EPOCHREALTIME".to_string(), Box::new(EpochRealtime::default()));
-        ans.params[0].insert("EPOCHSECONDS".to_string(), Box::new(EpochSeconds::default()));
+        ans.params[0].insert("EPOCHSECONDS".to_string(),
+                             Box::new(EpochTime::new(clock::get_epochseconds)));
+        ans.params[0].insert("EPOCHREALTIME".to_string(),
+                             Box::new(EpochTime::new(clock::get_epochrealtime)));
         ans
     }
 

src/core/database/data.rs

@@ -1,8 +1,7 @@
 //SPDXFileCopyrightText: 2025 Ryuichi Ueda ryuichiueda@gmail.com
 //SPDXLicense-Identifier: BSD-3-Clause
 
-pub mod epochrealtime;
-pub mod epochseconds;
+pub mod epochtime;
 pub mod random;
 pub mod srandom;
 pub mod seconds;

src/core/database/data/epochseconds.rs src/core/database/data/epochtime.rssrc/core/database/data/epochseconds.rs renamed to src/core/database/data/epochtime.rs

@@ -2,14 +2,14 @@
 //SPDXLicense-Identifier: BSD-3-Clause
 
 use super::{Data, ExecError};
-use crate::utils::clock;
 
-#[derive(Debug, Clone, Default)]
-pub struct EpochSeconds {
+#[derive(Debug, Clone)]
+pub struct EpochTime {
+    timefunc: fn() -> String,
     flags: String,
 }
 
-impl Data for EpochSeconds {
+impl Data for EpochTime {
     fn boxed_clone(&self) -> Box<dyn Data> {
         Box::new(self.clone())
     }
@@ -19,7 +19,7 @@ impl Data for EpochSeconds {
     }
 
     fn get_as_single(&mut self) -> Result<String, ExecError> {
-        Ok(clock::get_epochseconds())
+        Ok((self.timefunc)())
     }
 
     fn set_as_single(&mut self, name: &str, _: &str) -> Result<(), ExecError> {
@@ -36,3 +36,12 @@ impl Data for EpochSeconds {
         &self.flags
     }
 }
+
+impl EpochTime {
+    pub fn new(timefn: fn() -> String) -> Self {
+        Self {
+            timefunc: timefn,
+            flags: "".to_string(),
+        }
+    }
+}