From 489d5d501d62573627a7edfc06ca415d5d2faff6 Mon Sep 17 00:00:00 2001
From: Patryk Osmaczko <osmaczkopatryk@gmail.com>
Date: Mon, 27 Feb 2023 11:06:13 +0100
Subject: [PATCH] chore(node_config): move constants to NODE_CONFIG

---
 src/app_service/common/network_constants.nim | 9 ++++++---
 src/app_service/service/accounts/service.nim | 9 ---------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/app_service/common/network_constants.nim b/src/app_service/common/network_constants.nim
index 21f6ab691f..fd89d4a99e 100644
--- a/src/app_service/common/network_constants.nim
+++ b/src/app_service/common/network_constants.nim
@@ -280,11 +280,11 @@ var NODE_CONFIG* = %* {
   },
   "Name": "StatusDesktop",
   "NetworkId": 1,
-  "NoDiscovery": false,
+  "NoDiscovery": true,
   "PermissionsConfig": {
     "Enabled": true
   },
-  "Rendezvous": true,
+  "Rendezvous": false,
   "RegisterTopics": @["whispermail"],
   "RequireTopics": {
     "whisper": {
@@ -319,21 +319,24 @@ var NODE_CONFIG* = %* {
     "URL": "https://mainnet.infura.io/v3/" & INFURA_TOKEN_RESOLVED
   },
   "WakuConfig": {
+    "Enabled": false,
     "BloomFilterMode": true,
     "Enabled": true,
     "LightClient": true,
     "MinimumPoW": 0.001
   },
   "WakuV2Config": {
-    "Enabled": false,
+    "Enabled": true,
     "Host": "0.0.0.0",
     "Port": WAKU_V2_PORT,
     "LightClient": false,
     "PersistPeers": true,
     "EnableDiscV5": true,
+    "DiscoveryLimit": 20,
     "UDPPort": WAKU_V2_PORT,
     "PeerExchange": true,
     "AutoUpdate": true,
+    "Rendezvous": true,
   },
   "WalletConfig": {
     "Enabled": true,
diff --git a/src/app_service/service/accounts/service.nim b/src/app_service/service/accounts/service.nim
index 25783dfc36..80b14f155e 100644
--- a/src/app_service/service/accounts/service.nim
+++ b/src/app_service/service/accounts/service.nim
@@ -320,21 +320,12 @@ QtObject:
     result["UpstreamConfig"]["Enabled"] = true.newJBool()
     result["UpstreamConfig"]["URL"] = NETWORKS[0]{"rpcUrl"}
     result["ShhextConfig"]["InstallationID"] = newJString(installationId)
-    result["NoDiscovery"] = true.newJBool()
-    result["Rendezvous"] = false.newJBool()
 
     # TODO: fleet.status.im should have different sections depending on the node type
     #       or maybe it's not necessary because a node has the identify protocol
     result["ClusterConfig"]["WakuNodes"] = %* dnsDiscoveryURL
     result["ClusterConfig"]["DiscV5BootstrapNodes"] = %* dnsDiscoveryURL
 
-    result["WakuV2Config"]["EnableDiscV5"] = true.newJBool()
-    result["WakuV2Config"]["DiscoveryLimit"] = 20.newJInt()
-    result["WakuV2Config"]["Rendezvous"] = true.newJBool()
-    result["WakuV2Config"]["Enabled"] = true.newJBool()
-
-    result["WakuConfig"]["Enabled"] = false.newJBool()
-
     if TEST_PEER_ENR != "":
       let testPeerENRArr = %* @[TEST_PEER_ENR]
       result["ClusterConfig"]["WakuNodes"] = %* testPeerENRArr