MASQ-Project · bertllll · Oct 2, 2025 · Oct 2, 2025
diff --git a/masq_lib/src/lib.rs b/masq_lib/src/lib.rs
@@ -24,6 +24,7 @@ pub mod crash_point;
 pub mod data_version;
 pub mod exit_locations;
 pub mod shared_schema;
+pub mod simple_clock;
 pub mod test_utils;
 pub mod ui_gateway;
 pub mod ui_traffic_converter;
diff --git a/masq_lib/src/simple_clock.rs b/masq_lib/src/simple_clock.rs
@@ -0,0 +1,16 @@
+// Copyright (c) 2025, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
+
+use std::time::SystemTime;
+
+pub trait SimpleClock {
+    fn now(&self) -> SystemTime;
+}
+
+#[derive(Default)]
+pub struct SimpleClockReal {}
+
+impl SimpleClock for SimpleClockReal {
+    fn now(&self) -> SystemTime {
+        SystemTime::now()
+    }
+}
diff --git a/masq_lib/src/test_utils/mod.rs b/masq_lib/src/test_utils/mod.rs
@@ -5,5 +5,6 @@ pub mod fake_stream_holder;
 pub mod logging;
 pub mod mock_blockchain_client_server;
 pub mod mock_websockets_server;
+pub mod simple_clock;
 pub mod ui_connection;
 pub mod utils;
diff --git a/...ers/pending_payable_scanner/test_utils.rs → masq_lib/src/test_utils/simple_clock.rs b/...ers/pending_payable_scanner/test_utils.rs → masq_lib/src/test_utils/simple_clock.rs
@@ -1,21 +1,21 @@
 // Copyright (c) 2025, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
 
-use crate::blockchain::errors::validation_status::ValidationFailureClock;
+use crate::simple_clock::SimpleClock;
 use std::cell::RefCell;
 use std::time::SystemTime;
 
 #[derive(Default)]
-pub struct ValidationFailureClockMock {
+pub struct SimpleClockMock {
     now_results: RefCell<Vec<SystemTime>>,
 }
 
-impl ValidationFailureClock for ValidationFailureClockMock {
+impl SimpleClock for SimpleClockMock {
     fn now(&self) -> SystemTime {
         self.now_results.borrow_mut().remove(0)
     }
 }
 
-impl ValidationFailureClockMock {
+impl SimpleClockMock {
     pub fn now_result(self, result: SystemTime) -> Self {
         self.now_results.borrow_mut().push(result);
         self

diff --git a/node/src/accountant/db_access_objects/failed_payable_dao.rs b/node/src/accountant/db_access_objects/failed_payable_dao.rs
@@ -427,17 +427,16 @@ mod tests {
     };
     use crate::accountant::db_access_objects::utils::current_unix_timestamp;
     use crate::accountant::db_access_objects::Transaction;
-    use crate::accountant::scanners::pending_payable_scanner::test_utils::ValidationFailureClockMock;
     use crate::blockchain::errors::rpc_errors::{AppRpcErrorKind, LocalErrorKind, RemoteErrorKind};
-    use crate::blockchain::errors::validation_status::{
-        PreviousAttempts, ValidationFailureClockReal, ValidationStatus,
-    };
+    use crate::blockchain::errors::validation_status::{PreviousAttempts, ValidationStatus};
     use crate::blockchain::errors::BlockchainErrorKind;
     use crate::blockchain::test_utils::{make_address, make_tx_hash};
     use crate::database::db_initializer::{
         DbInitializationConfig, DbInitializer, DbInitializerReal,
     };
     use crate::database::test_utils::ConnectionWrapperMock;
+    use masq_lib::simple_clock::SimpleClockReal;
+    use masq_lib::test_utils::simple_clock::SimpleClockMock;
     use masq_lib::test_utils::utils::ensure_node_home_directory_exists;
     use rusqlite::Connection;
     use std::collections::{BTreeSet, HashMap};
@@ -701,7 +700,7 @@ mod tests {
 
     #[test]
     fn failure_status_from_str_works() {
-        let validation_failure_clock = ValidationFailureClockMock::default().now_result(
+        let validation_failure_clock = SimpleClockMock::default().now_result(
             SystemTime::UNIX_EPOCH
                 .add(Duration::from_secs(1755080031))
                 .add(Duration::from_nanos(612180914)),
@@ -831,7 +830,7 @@ mod tests {
                     BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
                         RemoteErrorKind::Unreachable,
                     )),
-                    &ValidationFailureClockReal::default(),
+                    &SimpleClockReal::default(),
                 ),
             )))
             .build();
@@ -950,7 +949,7 @@ mod tests {
             ]))
             .unwrap();
         let timestamp = SystemTime::now();
-        let clock = ValidationFailureClockMock::default()
+        let clock = SimpleClockMock::default()
             .now_result(timestamp)
             .now_result(timestamp);
         let hashmap = HashMap::from([

diff --git a/node/src/accountant/db_access_objects/sent_payable_dao.rs b/node/src/accountant/db_access_objects/sent_payable_dao.rs
@@ -540,20 +540,19 @@ mod tests {
         make_read_only_db_connection, make_sent_tx, TxBuilder,
     };
     use crate::accountant::db_access_objects::Transaction;
-    use crate::accountant::scanners::pending_payable_scanner::test_utils::ValidationFailureClockMock;
     use crate::blockchain::blockchain_interface::data_structures::TxBlock;
     use crate::blockchain::errors::internal_errors::InternalErrorKind;
     use crate::blockchain::errors::rpc_errors::{AppRpcErrorKind, LocalErrorKind, RemoteErrorKind};
-    use crate::blockchain::errors::validation_status::{
-        PreviousAttempts, ValidationFailureClockReal, ValidationStatus,
-    };
+    use crate::blockchain::errors::validation_status::{PreviousAttempts, ValidationStatus};
     use crate::blockchain::errors::BlockchainErrorKind;
     use crate::blockchain::test_utils::{make_address, make_block_hash, make_tx_hash};
     use crate::database::db_initializer::{
         DbInitializationConfig, DbInitializer, DbInitializerReal,
     };
     use crate::database::test_utils::ConnectionWrapperMock;
     use ethereum_types::{H256, U64};
+    use masq_lib::simple_clock::SimpleClockReal;
+    use masq_lib::test_utils::simple_clock::SimpleClockMock;
     use masq_lib::test_utils::utils::ensure_node_home_directory_exists;
     use rusqlite::Connection;
     use std::cmp::Ordering;
@@ -578,13 +577,13 @@ mod tests {
                     BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
                         RemoteErrorKind::Unreachable,
                     )),
-                    &ValidationFailureClockReal::default(),
+                    &SimpleClockReal::default(),
                 )
                 .add_attempt(
                     BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
                         RemoteErrorKind::Unreachable,
                     )),
-                    &ValidationFailureClockReal::default(),
+                    &SimpleClockReal::default(),
                 ),
             )))
             .build();
@@ -822,7 +821,7 @@ mod tests {
                     BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
                         RemoteErrorKind::Unreachable,
                     )),
-                    &ValidationFailureClockReal::default(),
+                    &SimpleClockReal::default(),
                 ),
             )))
             .build();
@@ -1205,7 +1204,7 @@ mod tests {
         let mut tx2 = make_sent_tx(789);
         tx2.status = TxStatus::Pending(ValidationStatus::Reattempting(PreviousAttempts::new(
             BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(RemoteErrorKind::Unreachable)),
-            &ValidationFailureClockMock::default().now_result(timestamp_b),
+            &SimpleClockMock::default().now_result(timestamp_b),
         )));
         let mut tx3 = make_sent_tx(123);
         tx3.status = TxStatus::Pending(ValidationStatus::Waiting);
@@ -1217,7 +1216,7 @@ mod tests {
                 tx1.hash,
                 TxStatus::Pending(ValidationStatus::Reattempting(PreviousAttempts::new(
                     BlockchainErrorKind::AppRpc(AppRpcErrorKind::Local(LocalErrorKind::Internal)),
-                    &ValidationFailureClockMock::default().now_result(timestamp_a),
+                    &SimpleClockMock::default().now_result(timestamp_a),
                 ))),
             ),
             (
@@ -1227,13 +1226,13 @@ mod tests {
                         BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
                             RemoteErrorKind::Unreachable,
                         )),
-                        &ValidationFailureClockMock::default().now_result(timestamp_b),
+                        &SimpleClockMock::default().now_result(timestamp_b),
                     )
                     .add_attempt(
                         BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
                             RemoteErrorKind::Unreachable,
                         )),
-                        &ValidationFailureClockReal::default(),
+                        &SimpleClockReal::default(),
                     ),
                 )),
             ),
@@ -1266,7 +1265,7 @@ mod tests {
             updated_txs[1].status,
             TxStatus::Pending(ValidationStatus::Reattempting(PreviousAttempts::new(
                 BlockchainErrorKind::AppRpc(AppRpcErrorKind::Local(LocalErrorKind::Internal)),
-                &ValidationFailureClockMock::default().now_result(timestamp_a)
+                &SimpleClockMock::default().now_result(timestamp_a)
             )))
         );
         assert_eq!(
@@ -1276,13 +1275,13 @@ mod tests {
                     BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
                         RemoteErrorKind::Unreachable
                     )),
-                    &ValidationFailureClockMock::default().now_result(timestamp_b)
+                    &SimpleClockMock::default().now_result(timestamp_b)
                 )
                 .add_attempt(
                     BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(
                         RemoteErrorKind::Unreachable
                     )),
-                    &ValidationFailureClockReal::default()
+                    &SimpleClockReal::default()
                 )
             ))
         );
@@ -1318,7 +1317,7 @@ mod tests {
             make_tx_hash(1),
             TxStatus::Pending(ValidationStatus::Reattempting(PreviousAttempts::new(
                 BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(RemoteErrorKind::Unreachable)),
-                &ValidationFailureClockReal::default(),
+                &SimpleClockReal::default(),
             ))),
         )]));
 
@@ -1512,8 +1511,8 @@ mod tests {
 
     #[test]
     fn tx_status_from_str_works() {
-        let validation_failure_clock = ValidationFailureClockMock::default()
-            .now_result(UNIX_EPOCH.add(Duration::from_secs(12456)));
+        let validation_failure_clock =
+            SimpleClockMock::default().now_result(UNIX_EPOCH.add(Duration::from_secs(12456)));
 
         assert_eq!(
             TxStatus::from_str(r#"{"Pending":"Waiting"}"#).unwrap(),
@@ -1579,15 +1578,15 @@ mod tests {
         let tx_status_1 = TxStatus::Pending(ValidationStatus::Waiting);
         let tx_status_2 = TxStatus::Pending(ValidationStatus::Reattempting(PreviousAttempts::new(
             BlockchainErrorKind::AppRpc(AppRpcErrorKind::Remote(RemoteErrorKind::InvalidResponse)),
-            &ValidationFailureClockReal::default(),
+            &SimpleClockReal::default(),
         )));
         let tx_status_3 = TxStatus::Pending(ValidationStatus::Reattempting(PreviousAttempts::new(
             BlockchainErrorKind::AppRpc(AppRpcErrorKind::Local(LocalErrorKind::Decoder)),
-            &ValidationFailureClockReal::default(),
+            &SimpleClockReal::default(),
         )));
         let tx_status_4 = TxStatus::Pending(ValidationStatus::Reattempting(PreviousAttempts::new(
             BlockchainErrorKind::Internal(InternalErrorKind::PendingTooLongNotReplaced),
-            &ValidationFailureClockReal::default(),
+            &SimpleClockReal::default(),
         )));
         let tx_status_5 = TxStatus::Confirmed {
             block_hash: format!("{:?}", make_tx_hash(1)),