status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: code review

This commit is contained in:
Richard Ramos 2021-12-16 15:44:07 -04:00
parent c0108bd1bf
commit f0ee4bb402
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app_service/tasks/marathon/mailserver/model.nim
View File

@ -73,15 +73,15 @@ proc init*(self: MailserverModel) =
if self.wakuVersion == 2: if self.wakuVersion == 2:
# TODO: # TODO:
# Instead of obtaining the waku2 fleet from fleet.json, expose a method in status-go that will # Instead of obtaining the waku2 fleet from fleet.json, expose a method in status-go that will
# return the list of store nodes. (The cluster config can ontain dns-discovery urls so it cannot be # return the list of store nodes. (The cluster config can contain dns-discovery urls so it cannot be
# used to populate the list of mailservers) # used to populate the list of mailservers)
let fleets = if defined(windows) and defined(production): let fleets = if defined(windows) and defined(production):
"/../resources/fleets.json" "/../resources/fleets.json"
else: else:
"/../fleets.json" "/../fleets.json"
let fleetConfig = readFile(joinPath(getAppDir(), fleets)) let fleetConfig = readFile(joinPath(getAppDir(), fleets))
let fleet = newFleetModel(fleetConfig) let fleetModel = newFleetModel(fleetConfig)
self.mailservers = toSeq(fleet.config.getMailservers(status_settings.getFleet(), true).values) self.mailservers = toSeq(fleetModel.config.getMailservers(status_settings.getFleet(), isWakuV2=true).values)
else: else:
for mailserver in nodeConfig["ClusterConfig"]["TrustedMailServers"].getElems(): for mailserver in nodeConfig["ClusterConfig"]["TrustedMailServers"].getElems():
self.mailservers.add(mailserver.getStr()) self.mailservers.add(mailserver.getStr())