logos-messaging/logos-messaging-nim
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-nim.git synced 2026-01-05 23:43:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(node): remove subscription to waku default network topic (#1545)

Browse Source
This commit is contained in:
Lorenzo Delgado 2023-02-10 17:55:47 +01:00 committed by GitHub
parent f88dc816ee
commit 1ea771fb2f
5 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/v2/test_peer_exchange.nim
View File

@ -34,11 +34,11 @@ procSuite "Peer Exchange":
completionFut = newFuture[bool]()
proc ignorePeerExchange(peer: PeerId, topic: string,
peers: seq[RoutingRecordsPair]) {.gcsafe, raises: [Defect].} =
peers: seq[RoutingRecordsPair]) {.gcsafe.} =
discard
proc handlePeerExchange(peer: PeerId, topic: string,
peers: seq[RoutingRecordsPair]) {.gcsafe, raises: [Defect].} =
peers: seq[RoutingRecordsPair]) {.gcsafe.} =
## Handle peers received via gossipsub peer exchange
let peerRecords = peers.mapIt(it.record.get())
@ -54,9 +54,9 @@ procSuite "Peer Exchange":
peerExchangeHandler = handlePeerExchange
emptyHandler = ignorePeerExchange
await node1.mountRelay(peerExchangeHandler = some(emptyHandler))
await node2.mountRelay(peerExchangeHandler = some(emptyHandler))
await node3.mountRelay(peerExchangeHandler = some(peerExchangeHandler))
await node1.mountRelay(topics = @[DefaultPubsubTopic], peerExchangeHandler = some(emptyHandler))
await node2.mountRelay(topics = @[DefaultPubsubTopic], peerExchangeHandler = some(emptyHandler))
await node3.mountRelay(topics = @[DefaultPubsubTopic], peerExchangeHandler = some(peerExchangeHandler))
# Ensure that node1 prunes all peers after the first connection
node1.wakuRelay.parameters.dHigh = 1

4
tests/v2/test_rest_relay_api.nim
View File

@ -68,7 +68,7 @@ suite "REST API - Relay":
check:
# Node should be subscribed to default + new topics
toSeq(node.wakuRelay.subscribedTopics).len == 1 + pubSubTopics.len
toSeq(node.wakuRelay.subscribedTopics).len == pubSubTopics.len
await restServer.stop()
await restServer.closeWait()
@ -191,7 +191,7 @@ suite "REST API - Relay":
let client = newRestHttpClient(initTAddress(restAddress, restPort))
# At this stage the node is only subscribed to the default topic
node.subscribe(DefaultPubsubTopic)
require:
toSeq(node.wakuRelay.subscribedTopics).len == 1

18
tests/v2/test_wakunode_rln_relay.nim
View File

@ -47,7 +47,7 @@ procSuite "WakuNode - RLN relay":
# set up three nodes
# node1
await node1.mountRelay(@[rlnRelayPubSubTopic])
await node1.mountRelay(@[DefaultPubsubTopic, rlnRelayPubSubTopic])
# mount rlnrelay in off-chain mode
await node1.mountRlnRelay(WakuRlnConfig(rlnRelayDynamic: false,
@ -59,7 +59,7 @@ procSuite "WakuNode - RLN relay":
await node1.start()
# node 2
await node2.mountRelay(@[rlnRelayPubSubTopic])
await node2.mountRelay(@[DefaultPubsubTopic, rlnRelayPubSubTopic])
# mount rlnrelay in off-chain mode
await node2.mountRlnRelay(WakuRlnConfig(rlnRelayDynamic: false,
rlnRelayPubsubTopic: rlnRelayPubSubTopic,
@ -70,7 +70,7 @@ procSuite "WakuNode - RLN relay":
await node2.start()
# node 3
await node3.mountRelay(@[rlnRelayPubSubTopic])
await node3.mountRelay(@[DefaultPubsubTopic, rlnRelayPubSubTopic])
await node3.mountRlnRelay(WakuRlnConfig(rlnRelayDynamic: false,
rlnRelayPubsubTopic: rlnRelayPubSubTopic,
@ -136,7 +136,7 @@ procSuite "WakuNode - RLN relay":
# node1
# set up three nodes
# node1
await node1.mountRelay(@[rlnRelayPubSubTopic])
await node1.mountRelay(@[DefaultPubsubTopic, rlnRelayPubSubTopic])
# mount rlnrelay in off-chain mode
await node1.mountRlnRelay(WakuRlnConfig(rlnRelayDynamic: false,
@ -148,7 +148,7 @@ procSuite "WakuNode - RLN relay":
await node1.start()
# node 2
await node2.mountRelay(@[rlnRelayPubSubTopic])
await node2.mountRelay(@[DefaultPubsubTopic, rlnRelayPubSubTopic])
# mount rlnrelay in off-chain mode
await node2.mountRlnRelay(WakuRlnConfig(rlnRelayDynamic: false,
rlnRelayPubsubTopic: rlnRelayPubSubTopic,
@ -159,7 +159,7 @@ procSuite "WakuNode - RLN relay":
await node2.start()
# node 3
await node3.mountRelay(@[rlnRelayPubSubTopic])
await node3.mountRelay(@[DefaultPubsubTopic, rlnRelayPubSubTopic])
await node3.mountRlnRelay(WakuRlnConfig(rlnRelayDynamic: false,
rlnRelayPubsubTopic: rlnRelayPubSubTopic,
@ -243,7 +243,7 @@ procSuite "WakuNode - RLN relay":
# set up three nodes
# node1
await node1.mountRelay(@[rlnRelayPubSubTopic])
await node1.mountRelay(@[DefaultPubsubTopic, rlnRelayPubSubTopic])
# mount rlnrelay in off-chain mode
await node1.mountRlnRelay(WakuRlnConfig(rlnRelayDynamic: false,
@ -255,7 +255,7 @@ procSuite "WakuNode - RLN relay":
await node1.start()
# node 2
await node2.mountRelay(@[rlnRelayPubSubTopic])
await node2.mountRelay(@[DefaultPubsubTopic, rlnRelayPubSubTopic])
# mount rlnrelay in off-chain mode
await node2.mountRlnRelay(WakuRlnConfig(rlnRelayDynamic: false,
@ -267,7 +267,7 @@ procSuite "WakuNode - RLN relay":
await node2.start()
# node 3
await node3.mountRelay(@[rlnRelayPubSubTopic])
await node3.mountRelay(@[DefaultPubsubTopic, rlnRelayPubSubTopic])
# mount rlnrelay in off-chain mode
await node3.mountRlnRelay(WakuRlnConfig(rlnRelayDynamic: false,

20
tests/v2/wakunode_jsonrpc/test_jsonrpc_relay.nim
View File

@ -38,7 +38,7 @@ procSuite "Waku v2 JSON-RPC API - Relay":
asyncTest "subscribe, unsubscribe and publish":
await node.start()
await node.mountRelay()
await node.mountRelay(topics = @[DefaultPubsubTopic])
# RPC server setup
let
@ -101,13 +101,13 @@ procSuite "Waku v2 JSON-RPC API - Relay":
message2 = WakuMessage(payload: payload2, contentTopic: contentTopic)
await node1.start()
await node1.mountRelay(@[pubSubTopic])
await node1.mountRelay(@[DefaultPubsubTopic, pubSubTopic])
await node2.start()
await node2.mountRelay(@[pubSubTopic])
await node2.mountRelay(@[DefaultPubsubTopic, pubSubTopic])
await node3.start()
await node3.mountRelay(@[pubSubTopic])
await node3.mountRelay(@[DefaultPubsubTopic, pubSubTopic])
await node1.connectToNodes(@[node2.switch.peerInfo.toRemotePeerInfo()])
await node3.connectToNodes(@[node2.switch.peerInfo.toRemotePeerInfo()])
@ -191,13 +191,13 @@ procSuite "Waku v2 JSON-RPC API - Relay":
topicCache = newTestMessageCache()
await node1.start()
await node1.mountRelay(@[pubSubTopic])
await node1.mountRelay(@[DefaultPubsubTopic, pubSubTopic])
await node2.start()
await node2.mountRelay(@[pubSubTopic])
await node2.mountRelay(@[DefaultPubsubTopic, pubSubTopic])
await node3.start()
await node3.mountRelay(@[pubSubTopic])
await node3.mountRelay(@[DefaultPubsubTopic, pubSubTopic])
await node1.connectToNodes(@[node2.switch.peerInfo.toRemotePeerInfo()])
await node3.connectToNodes(@[node2.switch.peerInfo.toRemotePeerInfo()])
@ -282,13 +282,13 @@ procSuite "Waku v2 JSON-RPC API - Relay":
topicCache = newTestMessageCache()
await node1.start()
await node1.mountRelay(@[pubSubTopic])
await node1.mountRelay(@[DefaultPubsubTopic, pubSubTopic])
await node2.start()
await node2.mountRelay(@[pubSubTopic])
await node2.mountRelay(@[DefaultPubsubTopic, pubSubTopic])
await node3.start()
await node3.mountRelay(@[pubSubTopic])
await node3.mountRelay(@[DefaultPubsubTopic, pubSubTopic])
await node1.connectToNodes(@[node2.switch.peerInfo.toRemotePeerInfo()])
await node3.connectToNodes(@[node2.switch.peerInfo.toRemotePeerInfo()])

3
waku/v2/node/waku_node.nim
View File

@ -548,9 +548,6 @@ proc mountRelay*(node: WakuNode,
info "relay mounted successfully"
# TODO: As part of #1545, remove this and update the tests cases
node.subscribe(DefaultPubsubTopic)
# Subscribe to topics
for topic in topics:
node.subscribe(topic)