From d49c95f6a142bde8cd607ca333eade5c405cf59a Mon Sep 17 00:00:00 2001 From: rshiv Date: Wed, 24 Nov 2021 15:10:29 +0000 Subject: [PATCH] publish addresses from announced address sequence. (#775) * publish multiple addresses Signed-off-by: rshiv * publish from announced address Signed-off-by: rshiv * change in json Signed-off-by: rshiv * changes format Signed-off-by: rshiv * makes listenstr a sequence Signed-off-by: rshiv * changes the wakuinfo Field Signed-off-by: rshiv * changes the test Signed-off-by: rshiv * changes the tests variable Signed-off-by: rshiv * changes test Signed-off-by: rshiv --- tests/v2/test_jsonrpc_waku.nim | 2 +- waku/v2/node/wakunode2.nim | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/v2/test_jsonrpc_waku.nim b/tests/v2/test_jsonrpc_waku.nim index 03bb2abf0..e1e0f0f94 100644 --- a/tests/v2/test_jsonrpc_waku.nim +++ b/tests/v2/test_jsonrpc_waku.nim @@ -63,7 +63,7 @@ procSuite "Waku v2 JSON-RPC API": let response = await client.get_waku_v2_debug_v1_info() check: - response.listenStr == $node.peerInfo.addrs[^1] & "/p2p/" & $node.peerInfo.peerId + response.listenAddresses == @[$node.peerInfo.addrs[^1] & "/p2p/" & $node.peerInfo.peerId] server.stop() server.close() diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim index a99679f55..c2a11f479 100644 --- a/waku/v2/node/wakunode2.nim +++ b/waku/v2/node/wakunode2.nim @@ -68,7 +68,7 @@ type WakuInfo* = object # NOTE One for simplicity, can extend later as needed - listenStr*: string + listenAddresses*: seq[string] #multiaddrStrings*: seq[string] # NOTE based on Eth2Node in NBC eth2_network.nim @@ -392,10 +392,12 @@ proc info*(node: WakuNode): WakuInfo = ## Status: Implemented. ## - # TODO Generalize this for other type of multiaddresses let peerInfo = node.peerInfo - let listenStr = $peerInfo.addrs[^1] & "/p2p/" & $peerInfo.peerId - let wakuInfo = WakuInfo(listenStr: listenStr) + var listenStr : seq[string] + for address in node.announcedAddresses: + var fulladdr = $address & "/p2p/" & $peerInfo.peerId + listenStr &= fulladdr + let wakuInfo = WakuInfo(listenAddresses: listenStr) return wakuInfo proc mountFilter*(node: WakuNode) {.raises: [Defect, KeyError, LPError]} =