Use setimer on Network.discover

These need to be replaced to use setTimer once TaskManager is fixed to use it.
bosagora · Jun 3, 2020 · b498e04 · b498e04
1 parent 7a2e4de
commit b498e04
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 26 deletions.
diff --git a/source/agora/node/FullNode.d b/source/agora/node/FullNode.d
@@ -153,30 +153,13 @@ public class FullNode : API
     ***************************************************************************/
 
     public void start ()
-    {
-        this.startPeriodicDiscovery();
-        this.network.startPeriodicCatchup(this.ledger);
-    }
-
-    /***************************************************************************
-
-        Starts the periodic network discovery task.
-
-    ***************************************************************************/
-
-    private void startPeriodicDiscovery ()
     {
         import core.time;
 
-        this.taskman.runTask(
-        ()
-        {
-            while (1)
-            {
-                this.network.discover();
-                this.taskman.wait(5.seconds);
-            }
-        });
+        scope void discover () { this.network.discover(); }
+        discover(); // avoid delay
+        this.taskman.setTimer(5.seconds, &discover, Periodic.Yes);
+        this.network.startPeriodicCatchup(this.ledger);
     }
 
     /***************************************************************************

diff --git a/source/agora/node/Validator.d b/source/agora/node/Validator.d
@@ -35,6 +35,7 @@ import ocean.util.log.Logger;
 
 import core.time;
 
+import std.functional;
 mixin AddLogger!();
 
 /*******************************************************************************
@@ -100,11 +101,9 @@ public class Validator : FullNode, API
             buildRequiredKeys(this.config.node.key_pair.address,
                 this.config.quorum, required_peer_keys);
 
-            while (1)
-            {
-                this.network.discover(required_peer_keys);
-                this.taskman.wait(5.seconds);
-            }
+            scope void discover () { this.network.discover(required_peer_keys); }
+            discover();  // avoid delay
+            this.taskman.setTimer(5.seconds, &discover, Periodic.Yes);
         });
     }