GNUNET_SCHEDULER_add does not work anymore before first call to GNUNET_SCHEDULER_do_work

1 files changed, 4 insertions, 15 deletions

diff --git a/src/gnunet_nim/cadet.nim b/src/gnunet_nim/cadet.nim
index b079f52..64991d7 100644
--- a/src/gnunet_nim/cadet.nim
+++ b/src/gnunet_nim/cadet.nim
@@ -140,18 +140,7 @@ proc disconnect(cadetHandle: ptr CadetHandle) =
 proc shutdownCb(cls: pointer) {.cdecl.} =
   disconnect(cast[ptr CadetHandle](cls))
 
-proc cadetConnectCb(cls: pointer) {.cdecl.} =
-  let app = cast[ptr GnunetApplication](cls)
-  var future: FutureBase
-  if app.connectFutures.take("cadet", future):
-    var cadetHandle: ref CadetHandle
-    new(cadetHandle, proc(handle: ref CadetHandle) = disconnect(addr handle[]))
-    cadetHandle.handle = GNUNET_CADET_connect(app.configHandle)
-    cadetHandle.shutdownTask = GNUNET_SCHEDULER_add_shutdown(shutdownCb,
-                                                             addr cadetHandle[])
-    Future[ref CadetHandle](future).complete(cadetHandle)
-
-proc initCadet*(app: ref GnunetApplication): Future[ref CadetHandle] =
-  result = newFuture[ref CadetHandle]("connectCadet")
-  app.connectFutures.add("cadet", result)
-  discard GNUNET_SCHEDULER_add_now(cadetConnectCb, addr app[])
+proc initCadet*(app: ref GnunetApplication): ref CadetHandle =
+  new(result, proc(handle: ref CadetHandle) = disconnect(addr handle[]))
+  result.handle = GNUNET_CADET_connect(app.configHandle)
+  result.shutdownTask = GNUNET_SCHEDULER_add_shutdown(shutdownCb, addr result[])