chore: Updating nim-chronicles, nim-chronos, nim-presto, nimcrypto, n…

…im-libp2p, and nim-nat-transversal (#2043)
waku-org · Sep 18, 2023 · f617cd9 · f617cd9
1 parent 72f9066
commit f617cd9
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 35 deletions.
diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
diff --git a/vendor/nim-nat-traversal b/vendor/nim-nat-traversal
diff --git a/vendor/nim-presto b/vendor/nim-presto
diff --git a/vendor/nimcrypto b/vendor/nimcrypto
diff --git a/waku/node/rest/store/handlers.nim b/waku/node/rest/store/handlers.nim
@@ -7,6 +7,7 @@ import
   std/strformat,
   stew/results,
   chronicles,
+  uri,
   json_serialization,
   presto/route
 import

diff --git a/waku/node/waku_metrics.nim b/waku/node/waku_metrics.nim
@@ -21,21 +21,17 @@ const LogInterval = 30.seconds
 logScope:
   topics = "waku node metrics"
 
-
-type
-  # https://github.com/nim-lang/Nim/issues/17369
-  MetricsLogger = proc(udata: pointer) {.gcsafe, raises: [Defect].}
-
 proc startMetricsLog*() =
-  var logMetrics: MetricsLogger
+  var logMetrics: CallbackFunc
 
   var cumulativeErrors = 0.float64
   var cumulativeConns = 0.float64
 
   let logRlnMetrics = getRlnMetricsLogger()
 
-  logMetrics = proc(udata: pointer) =
-    {.gcsafe.}:
+  logMetrics = CallbackFunc(
+    proc(udata: pointer) {.gcsafe.} =
+
       # TODO: libp2p_pubsub_peers is not public, so we need to make this either
       # public in libp2p or do our own peer counting after all.
 
@@ -62,6 +58,7 @@ proc startMetricsLog*() =
       # Start protocol specific metrics logging
       logRlnMetrics()
 
-    discard setTimer(Moment.fromNow(LogInterval), logMetrics)
+      discard setTimer(Moment.fromNow(LogInterval), logMetrics)
+  )
 
   discard setTimer(Moment.fromNow(LogInterval), logMetrics)
diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
@@ -114,14 +114,14 @@ proc getAutonatService*(rng: ref HmacDrbgContext): AutonatService =
   let autonatService = AutonatService.new(
     autonatClient = AutonatClient.new(),
     rng = rng,
-    scheduleInterval = Opt.some(chronos.seconds(120)),
+    scheduleInterval = some(chronos.seconds(120)),
     askNewConnectedPeers = false,
     numPeersToAsk = 3,
     maxQueueSize = 3,
     minConfidence = 0.7)
 
   proc statusAndConfidenceHandler(networkReachability: NetworkReachability,
-                                  confidence: Opt[float]):
+                                  confidence: Option[float]):
                                   Future[void]  {.gcsafe, async.} =
     if confidence.isSome():
       info "Peer reachability status", networkReachability=networkReachability, confidence=confidence.get()

diff --git a/waku/waku_archive/archive.nim b/waku/waku_archive/archive.nim
@@ -221,19 +221,21 @@ proc startMessageRetentionPolicyPeriodicTask*(w: WakuArchive,
   # Start the periodic message retention policy task
   # https://github.com/nim-lang/Nim/issues/17369
 
-  var executeRetentionPolicy: proc(udata: pointer) {.gcsafe, raises: [Defect].}
-  executeRetentionPolicy = proc(udata: pointer) {.gcsafe.} =
-
-    try:
-      let retPolRes = waitFor w.executeMessageRetentionPolicy()
-      if retPolRes.isErr():
-        waku_archive_errors.inc(labelValues = [retPolicyFailure])
-        error "error in periodic retention policy", error = retPolRes.error
-    except CatchableError:
-      waku_archive_errors.inc(labelValues = [retPolicyFailure])
-      error "exception in periodic retention policy",
-            error = getCurrentExceptionMsg()
-
-    discard setTimer(Moment.fromNow(interval), executeRetentionPolicy)
+  var executeRetentionPolicy: CallbackFunc
+  executeRetentionPolicy =
+    CallbackFunc(
+      proc (arg: pointer) {.gcsafe, raises: [].} =
+        try:
+          let retPolRes = waitFor w.executeMessageRetentionPolicy()
+          if retPolRes.isErr():
+            waku_archive_errors.inc(labelValues = [retPolicyFailure])
+            error "error in periodic retention policy", error = retPolRes.error
+        except CatchableError:
+          waku_archive_errors.inc(labelValues = [retPolicyFailure])
+          error "exception in periodic retention policy",
+                error = getCurrentExceptionMsg()
+
+        discard setTimer(Moment.fromNow(interval), executeRetentionPolicy)
+    )
 
   discard setTimer(Moment.fromNow(interval), executeRetentionPolicy)
diff --git a/waku/waku_filter_v2/protocol.nim b/waku/waku_filter_v2/protocol.nim
@@ -255,10 +255,12 @@ const MaintainSubscriptionsInterval* = 1.minutes
 
 proc startMaintainingSubscriptions*(wf: WakuFilter, interval: Duration) =
   trace "starting to maintain subscriptions"
-  var maintainSubs: proc(udata: pointer) {.gcsafe, raises: [Defect].}
-  maintainSubs = proc(udata: pointer) {.gcsafe.} =
-    maintainSubscriptions(wf)
-    wf.maintenanceTask = setTimer(Moment.fromNow(interval), maintainSubs)
+  var maintainSubs: CallbackFunc
+  maintainSubs = CallbackFunc(
+    proc(udata: pointer) {.gcsafe.} =
+      maintainSubscriptions(wf)
+      wf.maintenanceTask = setTimer(Moment.fromNow(interval), maintainSubs)
+  )
 
   wf.maintenanceTask = setTimer(Moment.fromNow(interval), maintainSubs)