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

Jump to bottom

fix: fix regresion + remove deprecated flag #2556

Merged
merged 3 commits into from
Mar 26, 2024
Merged

fix: fix regresion + remove deprecated flag #2556

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9d4c8f
fix: fix regresion + remove deprecated flag
alrevuelta Mar 26, 2024
6c134ef
Merge branch 'master' into dont-use-topics
alrevuelta Mar 26, 2024
4a0103d
fix: library
alrevuelta Mar 26, 2024
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
12 changes: 6 additions & 6 deletions tests/node/peer_manager/test_peer_manager.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ suite "Peer Manager":
# Given two nodes with the same shardId
let
server =
newTestWakuNode(serverKey, listenAddress, listenPort, topics = @[shardTopic0])
newTestWakuNode(serverKey, listenAddress, listenPort, pubsubTopics = @[shardTopic0])
client =
newTestWakuNode(clientKey, listenAddress, listenPort, topics = @[shardTopic1])
newTestWakuNode(clientKey, listenAddress, listenPort, pubsubTopics = @[shardTopic1])

# And both mount metadata and filter
discard client.mountMetadata(0) # clusterId irrelevant, overridden by topic
Expand Down Expand Up @@ -68,9 +68,9 @@ suite "Peer Manager":
# Given two nodes with the same shardId
let
server =
newTestWakuNode(serverKey, listenAddress, listenPort, topics = @[shardTopic0])
newTestWakuNode(serverKey, listenAddress, listenPort, pubsubTopics = @[shardTopic0])
client =
newTestWakuNode(clientKey, listenAddress, listenPort, topics = @[shardTopic0])
newTestWakuNode(clientKey, listenAddress, listenPort, pubsubTopics = @[shardTopic0])

# And both mount metadata and relay
discard client.mountMetadata(0) # clusterId irrelevant, overridden by topic
Expand Down Expand Up @@ -99,9 +99,9 @@ suite "Peer Manager":
# Given two nodes with different shardIds
let
server =
newTestWakuNode(serverKey, listenAddress, listenPort, topics = @[shardTopic0])
newTestWakuNode(serverKey, listenAddress, listenPort, pubsubTopics = @[shardTopic0])
client =
newTestWakuNode(clientKey, listenAddress, listenPort, topics = @[shardTopic1])
newTestWakuNode(clientKey, listenAddress, listenPort, pubsubTopics = @[shardTopic1])

# And both mount metadata and relay
discard client.mountMetadata(0) # clusterId irrelevant, overridden by topic
Expand Down
6 changes: 3 additions & 3 deletions tests/test_peer_manager.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ procSuite "Peer Manager":
ValidIpAddress.init("0.0.0.0"),
Port(0),
clusterId = clusterId3,
topics = @["/waku/2/rs/3/0"],
pubsubTopics = @["/waku/2/rs/3/0"],
)

# same network
Expand All @@ -429,14 +429,14 @@ procSuite "Peer Manager":
ValidIpAddress.init("0.0.0.0"),
Port(0),
clusterId = clusterId4,
topics = @["/waku/2/rs/4/0"],
pubsubTopics = @["/waku/2/rs/4/0"],
)
node3 = newTestWakuNode(
generateSecp256k1Key(),
ValidIpAddress.init("0.0.0.0"),
Port(0),
clusterId = clusterId4,
topics = @["/waku/2/rs/4/0"],
pubsubTopics = @["/waku/2/rs/4/0"],
)

node1.mountMetadata(clusterId3).expect("Mounted Waku Metadata")
Expand Down
4 changes: 2 additions & 2 deletions tests/test_peer_storage.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ suite "Peer Storage":
peerProto = "/waku/2/default-waku/codec"
connectedness = Connectedness.CanConnect
disconn = 999999
topics = @["/waku/2/rs/2/0", "/waku/2/rs/2/1"]
pubsubTopics = @["/waku/2/rs/2/0", "/waku/2/rs/2/1"]

# Create ENR
var enrBuilder = EnrBuilder.init(peerKey)
enrBuilder.withShardedTopics(topics).expect("Valid topics")
enrBuilder.withShardedTopics(pubsubTopics).expect("Valid topics")
let record = enrBuilder.build().expect("Valid record")

let stored = RemotePeerInfo(
Expand Down
8 changes: 4 additions & 4 deletions tests/testlib/wakunode.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ proc defaultTestWakuNodeConf*(): WakuNodeConf =
maxConnections: 50,
maxMessageSize: "1024 KiB",
clusterId: 1.uint32,
topics: @["/waku/2/rs/1/0"],
pubsubTopics: @["/waku/2/rs/1/0"],
relay: true,
storeMessageDbUrl: "sqlite://store.sqlite3",
)
Expand All @@ -59,7 +59,7 @@ proc newTestWakuNode*(
discv5UdpPort = none(Port),
agentString = none(string),
clusterId: uint32 = 1.uint32,
topics: seq[string] = @["/waku/2/rs/1/0"],
pubsubTopics: seq[string] = @["/waku/2/rs/1/0"],
peerStoreCapacity = none(int),
): WakuNode =
var resolvedExtIp = extIp
Expand All @@ -74,7 +74,7 @@ proc newTestWakuNode*(
var conf = defaultTestWakuNodeConf()

conf.clusterId = clusterId
conf.topics = topics
conf.pubsubTopics = pubsubTopics

if dns4DomainName.isSome() and extIp.isNone():
# If there's an error resolving the IP, an exception is thrown and test fails
Expand All @@ -101,7 +101,7 @@ proc newTestWakuNode*(

var enrBuilder = EnrBuilder.init(nodeKey)

enrBuilder.withShardedTopics(topics).isOkOr:
enrBuilder.withShardedTopics(pubsubTopics).isOkOr:
raise newException(Defect, "Invalid record: " & error)

enrBuilder.withIpAddressAndPorts(
Expand Down
7 changes: 0 additions & 7 deletions waku/factory/external_config.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,6 @@ type WakuNodeConf* = object
name: "keep-alive"
.}: bool

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]
Comment on lines -300 to -305
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would love to remove it but wasn't there someone still using this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the deprecation was announced many months ago.


pubsubTopics* {.
desc: "Default pubsub topic to subscribe to. Argument may be repeated.",
name: "pubsub-topic"
Expand Down
2 changes: 1 addition & 1 deletion waku/factory/internal_config.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ proc enrConfiguration*(
let shards: seq[uint16] =
# no shards configured
if conf.shards.len == 0:
toSeq(0 ..< conf.topics.len).mapIt(uint16(it))
toSeq(0 ..< conf.pubsubTopics.len).mapIt(uint16(it))
# some shards configured
else:
toSeq(conf.shards.mapIt(uint16(it)))
Expand Down
12 changes: 3 additions & 9 deletions waku/factory/node_factory.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,9 @@ proc setupProtocols(
peerExchangeHandler = some(handlePeerExchange)

if conf.relay:
let pubsubTopics =
if conf.pubsubTopics.len > 0 or conf.contentTopics.len > 0:
# TODO autoshard content topics only once.
# Already checked for errors in app.init
let shards =
conf.contentTopics.mapIt(node.wakuSharding.getShard(it).expect("Valid Shard"))
conf.pubsubTopics & shards
else:
conf.topics
let shards =
conf.contentTopics.mapIt(node.wakuSharding.getShard(it).expect("Valid Shard"))
let pubsubTopics = conf.pubsubTopics & shards

let parsedMaxMsgSize = parseMsgSize(conf.maxMessageSize).valueOr:
return err("failed to parse 'max-num-bytes-msg-size' param: " & $error)
Expand Down
Loading