From f136f8e75aec321c500bb7d87c30ba0fd462701d Mon Sep 17 00:00:00 2001
From: Jedrzej Stuczynski <jedrzej.stuczynski@gmail.com>
Date: Wed, 26 Feb 2020 11:31:27 +0000
Subject: [PATCH] Presence reporter responsible for starting own task

---
 mixnode/src/node/mod.rs      | 7 +++----
 mixnode/src/node/presence.rs | 8 +++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mixnode/src/node/mod.rs b/mixnode/src/node/mod.rs
index 9244022302..996c708a22 100644
--- a/mixnode/src/node/mod.rs
+++ b/mixnode/src/node/mod.rs
@@ -239,6 +239,7 @@ impl MixNode {
         let mut rt = Runtime::new()?;
 
         // Spawn Tokio tasks as necessary for node functionality
+    pub fn start_presence_notifier(&self) {
         let notifier_config = presence::NotifierConfig::new(
             self.config.get_presence_directory_server(),
             self.config.get_announce_address(),
@@ -246,10 +247,8 @@ impl MixNode {
             self.config.get_layer(),
             self.config.get_presence_sending_delay(),
         );
-        rt.spawn({
-            let presence_notifier = presence::Notifier::new(notifier_config);
-            presence_notifier.run()
-        });
+        presence::Notifier::new(notifier_config).start(self.runtime.handle())
+    }
 
         let metrics = MetricsReporter::new().add_arc_mutex();
         rt.spawn(MetricsReporter::run_received_metrics_control(
diff --git a/mixnode/src/node/presence.rs b/mixnode/src/node/presence.rs
index 667b4b0f21..120d6d429b 100644
--- a/mixnode/src/node/presence.rs
+++ b/mixnode/src/node/presence.rs
@@ -2,8 +2,10 @@ use crate::built_info;
 use directory_client::presence::mixnodes::MixNodePresence;
 use directory_client::requests::presence_mixnodes_post::PresenceMixNodesPoster;
 use directory_client::DirectoryClient;
+use futures::task::SpawnExt;
 use log::{debug, error};
 use std::time::Duration;
+use tokio::runtime::Handle;
 
 pub struct NotifierConfig {
     directory_server: String,
@@ -64,10 +66,14 @@ impl Notifier {
         }
     }
 
-    pub async fn run(self) {
+    pub async fn run(&self) {
         loop {
             self.notify();
             tokio::time::delay_for(self.sending_delay).await;
         }
     }
+
+    pub fn start(self, handle: &Handle) {
+        handle.spawn(async move { self.run() });
+    }
 }