Use per-instance `Mono_Time` for Messenger and onion.

2 files changed, 12 insertions, 7 deletions

diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 1d01f0a2..5e5f6834 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -190,11 +190,11 @@ int main(int argc, char *argv[])
     IP ip;
     ip_init(&ip, ipv6enabled);
 
-    DHT *dht = new_dht(nullptr, new_networking(nullptr, ip, PORT), true);
+    Mono_Time *const mono_time = mono_time_new();
+    DHT *dht = new_dht(nullptr, mono_time, new_networking(nullptr, ip, PORT), true);
     printf("OUR ID: ");
-    uint32_t i;
 
-    for (i = 0; i < 32; i++) {
+    for (uint32_t i = 0; i < 32; i++) {
         const uint8_t *const self_public_key = dht_get_self_public_key(dht);
 
         if (self_public_key[i] < 16) {
@@ -238,7 +238,7 @@ int main(int argc, char *argv[])
 #endif
 
     while (1) {
-        unix_time_update();
+        mono_time_update(mono_time);
 
         do_dht(dht);
 
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index a5abfda0..880fc514 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -107,11 +107,16 @@ int main(int argc, char *argv[])
         exit(0);
     }
 
-    unix_time_update();
+    Mono_Time *const mono_time = mono_time_new();
+
+    if (mono_time == nullptr) {
+        fputs("Failed to allocate monotonic timer datastructure\n", stderr);
+        exit(0);
+    }
 
     Messenger_Options options = {0};
     options.ipv6enabled = ipv6enabled;
-    m = new_messenger(&options, nullptr);
+    m = new_messenger(mono_time, &options, nullptr);
 
     if (!m) {
         fputs("Failed to allocate messenger datastructure\n", stderr);
@@ -180,7 +185,7 @@ int main(int argc, char *argv[])
     perror("Initialization");
 
     while (1) {
-        unix_time_update();
+        mono_time_update(mono_time);
 
         uint8_t name[128];
         const char *const filename = "Save.bak";