fix(rln-relay): waitFor startup, otherwise valid proofs will be marke…

…d invalid (#1920)
waku-org · Aug 22, 2023 · 6c6302f · 6c6302f
1 parent 0ac8a7f
commit 6c6302f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
@@ -515,7 +515,7 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
           rlnRelayCredentialsPassword: conf.rlnRelayCredentialsPassword
         )
 
-        await node.mountRlnRelay(rlnConf,
+        waitFor node.mountRlnRelay(rlnConf,
                                  spamHandler=some(spamHandler))
 
         let membershipIndex = node.wakuRlnRelay.groupManager.membershipIndex.get()

diff --git a/apps/wakunode2/app.nim b/apps/wakunode2/app.nim
@@ -408,7 +408,7 @@ proc setupProtocols(node: WakuNode,
       )
 
       try:
-        await node.mountRlnRelay(rlnConf)
+        waitFor node.mountRlnRelay(rlnConf)
       except CatchableError:
         return err("failed to mount waku RLN relay protocol: " & getCurrentExceptionMsg())
 

diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
@@ -731,11 +731,8 @@ when defined(rln):
 
     if node.wakuRelay.isNil():
       raise newException(CatchableError, "WakuRelay protocol is not mounted, cannot mount WakuRlnRelay")
-    # TODO: check whether the pubsub topic is supported at the relay level
-    # if rlnConf.rlnRelayPubsubTopic notin node.wakuRelay.defaultPubsubTopics:
-    #   error "The relay protocol does not support the configured pubsub topic for WakuRlnRelay"
 
-    let rlnRelayRes = await WakuRlnRelay.new(rlnConf,
+    let rlnRelayRes = waitFor WakuRlnRelay.new(rlnConf,
                                              registrationHandler)
     if rlnRelayRes.isErr():
       raise newException(CatchableError, "failed to mount WakuRlnRelay: " & rlnRelayRes.error)