waku-org
/
nwaku
mirror of https://github.com/waku-org/nwaku.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(rln-relay): waitFor startup, otherwise valid proofs will be marked invalid (#1920)

This commit is contained in:
Aaryamann Challani 2023-08-22 17:47:06 +05:30 committed by GitHub
parent 0ac8a7f0cd
commit 6c6302f9e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/chat2/chat2.nim
View File

@ -515,7 +515,7 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
rlnRelayCredentialsPassword: conf.rlnRelayCredentialsPassword rlnRelayCredentialsPassword: conf.rlnRelayCredentialsPassword
) )
await node.mountRlnRelay(rlnConf, waitFor node.mountRlnRelay(rlnConf,
spamHandler=some(spamHandler)) spamHandler=some(spamHandler))
let membershipIndex = node.wakuRlnRelay.groupManager.membershipIndex.get() let membershipIndex = node.wakuRlnRelay.groupManager.membershipIndex.get()

2
apps/wakunode2/app.nim
View File

@ -408,7 +408,7 @@ proc setupProtocols(node: WakuNode,
) )
try: try:
await node.mountRlnRelay(rlnConf) waitFor node.mountRlnRelay(rlnConf)
except CatchableError: except CatchableError:
return err("failed to mount waku RLN relay protocol: " & getCurrentExceptionMsg()) return err("failed to mount waku RLN relay protocol: " & getCurrentExceptionMsg())

5
waku/node/waku_node.nim
View File

@ -731,11 +731,8 @@ when defined(rln):
if node.wakuRelay.isNil(): if node.wakuRelay.isNil():
raise newException(CatchableError, "WakuRelay protocol is not mounted, cannot mount WakuRlnRelay") 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) registrationHandler)
if rlnRelayRes.isErr(): if rlnRelayRes.isErr():
raise newException(CatchableError, "failed to mount WakuRlnRelay: " & rlnRelayRes.error) raise newException(CatchableError, "failed to mount WakuRlnRelay: " & rlnRelayRes.error)