waku-org/nwaku
1
0
Fork 0
mirror of https://github.com/waku-org/nwaku.git synced 2025-01-14 08:57:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong install of filter rest api - now installed when using filter client mode and filter client protocol is mounted correctly (#2133)

Browse Source
This commit is contained in:
NagyZoltanPeter 2023-10-18 11:47:47 +02:00 committed by GitHub
parent a5b1cfd024
commit 5277d122d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/wakunode2/app.nim
View File

@ -473,9 +473,12 @@ proc setupProtocols(node: WakuNode,
if conf.filternode != "": if conf.filternode != "":
let filterNode = parsePeerInfo(conf.filternode) let filterNode = parsePeerInfo(conf.filternode)
if filterNode.isOk(): if filterNode.isOk():
await node.mountFilterClient() try:
node.peerManager.addServicePeer(filterNode.value, WakuLegacyFilterCodec) await node.mountFilterClient()
node.peerManager.addServicePeer(filterNode.value, WakuFilterSubscribeCodec) node.peerManager.addServicePeer(filterNode.value, WakuLegacyFilterCodec)
node.peerManager.addServicePeer(filterNode.value, WakuFilterSubscribeCodec)
except CatchableError:
return err("failed to mount waku filter client protocol: " & getCurrentExceptionMsg())
else: else:
return err("failed to set node waku filter peer: " & filterNode.error) return err("failed to set node waku filter peer: " & filterNode.error)
@ -595,7 +598,10 @@ proc startRestServer(app: App, address: ValidIpAddress, port: Port, conf: WakuNo
installRelayApiHandlers(server.router, app.node, cache) installRelayApiHandlers(server.router, app.node, cache)
## Filter REST API ## Filter REST API
if conf.filter: if conf.filternode != "" and
app.node.wakuFilterClient != nil and
app.node.wakuFilterClientLegacy != nil:
let legacyFilterCache = rest_legacy_filter_api.MessageCache.init() let legacyFilterCache = rest_legacy_filter_api.MessageCache.init()
rest_legacy_filter_api.installLegacyFilterRestApiHandlers(server.router, app.node, legacyFilterCache) rest_legacy_filter_api.installLegacyFilterRestApiHandlers(server.router, app.node, legacyFilterCache)
@ -606,7 +612,9 @@ proc startRestServer(app: App, address: ValidIpAddress, port: Port, conf: WakuNo
installStoreApiHandlers(server.router, app.node) installStoreApiHandlers(server.router, app.node)
## Light push API ## Light push API
rest_lightpush_api.installLightPushRequestHandler(server.router, app.node) if conf.lightpushnode != "" and
app.node.wakuLightpushClient != nil:
rest_lightpush_api.installLightPushRequestHandler(server.router, app.node)
server.start() server.start()
info "Starting REST HTTP server", url = "http://" & $address & ":" & $port & "/" info "Starting REST HTTP server", url = "http://" & $address & ":" & $port & "/"