Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Aug 22, 2023
+3 −6
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/chat2/chat2.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion apps/wakunode2/app.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())

Expand Down
5 changes: 1 addition & 4 deletions waku/node/waku_node.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down