fix(rest): properly check if rln is used #2205
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alrevuelta
reviewed
Nov 9, 2023
| @@ -174,7 +174,7 @@ proc installRelayApiHandlers*(router: var RestRouter, node: WakuNode, cache: Mes | |||
| return RestApiResponse.internalServerError("Failed to publish: unknown RLN proof validation result") | |||
|
|
|||
| # if we reach here its either a non-RLN message or a RLN message with a valid proof | |||
| debug "Publishing message", pubSubTopic=pubSubTopic, rln=defined(rln) | |||
| debug "Publishing message", pubSubTopic=pubSubTopic, rln=not node.wakuRlnRelay.isNil() | |||
| if not (waitFor node.publish(some(pubSubTopic), message).withTimeout(futTimeout)): | |||
| error "Failed to publish message to topic", pubSubTopic=pubSubTopic | |||
| return RestApiResponse.internalServerError("Failed to publish: timedout") | |||
There was a problem hiding this comment.
can we fix it below as well?
nwaku/waku/waku_api/rest/relay/handlers.nim
Line 307 in a8763a3
There was a problem hiding this comment.
Good point, missed that. It was also present in jsonrpc, so I fixed that too.
the defined(rln) is still used in libwaku (cc @Ivansete-status) - not touching that for this PR:)
|
You can find the image built from this PR at Built from 53e444c |
SionoiS
approved these changes
Nov 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixing leftover check for
define(rln)from when RLN was compiled in conditionally.Using the option to get a boolean instead
Changes