fix: fix regresion + remove deprecated flag #2556
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
commented
Mar 26, 2024
waku/factory/internal_config.nim
Outdated
| @@ -33,7 +33,7 @@ proc enrConfiguration*(conf: WakuNodeConf, netConfig: NetConfig, key: crypto.Pri | |||
|
|
|||
| let shards: seq[uint16] = | |||
| # no shards configured | |||
| if conf.shards.len == 0: toSeq(0..<conf.topics.len).mapIt(uint16(it)) | |||
| if conf.shards.len == 0: toSeq(0..<conf.pubsubTopics.len).mapIt(uint16(it)) | |||
There was a problem hiding this comment.
this was casing the regression. topics was empty since its not used.
Ivansete-status
approved these changes
Mar 26, 2024
waku/factory/node_factory.nim
Outdated
| conf.pubsubTopics & shards | ||
| else: | ||
| conf.topics | ||
| let shards = conf.contentTopics.mapIt(node.wakuSharding.getShard(it).expect("Valid Shard")) |
There was a problem hiding this comment.
Does it crash if contentTopics is empty?
There was a problem hiding this comment.
nope, since mapIt iterates over contentTopics, if its empty, then there is nothing to iterate. so no crash :)
alrevuelta
force-pushed
the
dont-use-topics
branch
3 times, most recently
from
97bc62c
to
7725480
Compare
|
You can find the image built from this PR at Built from 87aa0f0 |
alrevuelta
force-pushed
the
dont-use-topics
branch
from
7725480
to
b9d4c8f
Compare
SionoiS
approved these changes
Mar 26, 2024
Comment on lines
-300
to
-305
| topics* {. | ||
| desc: | ||
| "Default topic to subscribe to. Argument may be repeated. Deprecated! Please use pubsub-topic and/or content-topic instead.", | ||
| defaultValue: @["/waku/2/default-waku/proto"], | ||
| name: "topic" | ||
| .}: seq[string] |
There was a problem hiding this comment.
I would love to remove it but wasn't there someone still using this?
There was a problem hiding this comment.
the deprecation was announced many months ago.
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
topics. Deprecated long time ago in favour ofpubsubTopics.topicsflag.