Revert "feat: shards.test fleet"

This reverts commit 1eeefc4.

src/app/core/fleets/fleet_configuration.nim

@@ -10,18 +10,13 @@ type
     GoWakuTest = "go-waku.test"
     StatusTest = "status.test"
     StatusProd = "status.prod"
-    ShardsTest = "shards.test"
 
   FleetNodes* {.pure.} = enum
     Bootnodes = "boot",
     Mailservers = "mail",
     Rendezvous = "rendezvous",
     Whisper = "whisper",
     Waku = "tcp/p2p/waku"
-    WakuENR = "enr/p2p/waku"
-    WakuBoot = "tcp/p2p/waku/boot"
-    WakuBootENR = "enr/p2p/waku/boot"
-    WakuStore = "tcp/p2p/waku/store"
     Websocket = "wss/p2p/waku"
 
   Meta* = object
@@ -59,30 +54,14 @@ proc extractConfig(self: FleetConfiguration, jsonString: string) {.gcsafe.} =
         self.fleet[fleet][nodes][server] = fleetJson["fleets"][fleet][nodes][server].getStr
 
 proc getNodes*(self: FleetConfiguration, fleet: Fleet, nodeType: FleetNodes = FleetNodes.Bootnodes): seq[string] =
-  var t = nodeType
-  if fleet == Fleet.ShardsTest:
-      case nodeType:
-       of Bootnodes: t = WakuBoot
-       of Mailservers: t = WakuStore
-       of WakuENR: t = WakuBootENR
-       else: discard
-
-  if not self.fleet[$fleet].hasKey($t): return
-  result = toSeq(self.fleet[$fleet][$t].values)
+  if not self.fleet[$fleet].hasKey($nodeType): return
+  result = toSeq(self.fleet[$fleet][$nodeType].values)
 
 proc getMailservers*(self: FleetConfiguration, fleet: Fleet, isWakuV2: bool): Table[string, string] =
   # TODO: If using wakuV2, this assumes that Waku nodes in fleet.status.json are also store nodes.
   # Maybe it make senses to add a "waku-store" section in case we want to have separate node types?
   # Discuss with @iurimatias, @cammellos and Vac team
-  var fleetKey: string
-  if isWakuV2:
-    if fleet == Fleet.ShardsTest:
-      fleetKey = $FleetNodes.WakuStore 
-    else:
-      fleetKey = $FleetNodes.Waku 
-  else:
-    fleetKey = $FleetNodes.Mailservers
-
+  let fleetKey = if isWakuV2: $FleetNodes.Waku else: $FleetNodes.Mailservers
   if not self.fleet[$fleet].hasKey(fleetKey) :
     result = initTable[string,string]()
     return

src/app_service/service/accounts/service.nim

@@ -310,7 +310,7 @@ QtObject:
 
   proc getDefaultNodeConfig*(self: Service, installationId: string, recoverAccount: bool): JsonNode =
     let fleet = Fleet.StatusProd
-    let dnsDiscoveryURL = "enrtree://AL65EKLJAUXKKPG43HVTML5EFFWEZ7L4LOKTLZCLJASG4DSESQZEC@prod.status.nodes.status.im"
+    let dnsDiscoveryURL = @["enrtree://AL65EKLJAUXKKPG43HVTML5EFFWEZ7L4LOKTLZCLJASG4DSESQZEC@prod.status.nodes.status.im"]
 
     result = NODE_CONFIG.copy()
     result["ClusterConfig"]["Fleet"] = newJString($fleet)
@@ -326,12 +326,8 @@ QtObject:
 
     # 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]
-
-    var discV5Bootnodes = self.fleetConfiguration.getNodes(fleet, FleetNodes.WakuENR)
-    discV5Bootnodes.add(dnsDiscoveryURL)
-
-    result["ClusterConfig"]["DiscV5BootstrapNodes"] = %* discV5Bootnodes
+    result["ClusterConfig"]["WakuNodes"] = %* dnsDiscoveryURL
+    result["ClusterConfig"]["DiscV5BootstrapNodes"] = %* dnsDiscoveryURL
 
     if TEST_PEER_ENR != "":
       let testPeerENRArr = %* @[TEST_PEER_ENR]

src/app_service/service/node_configuration/dto/node_config.nim

@@ -104,7 +104,6 @@ type
     StoreCapacity*: int
     StoreSeconds*: int
     EnableFilterFullNode*: bool
-    UseShardAsDefaultTopic*: bool
 
   ShhextConfig* = object
     PFSEnabled*: bool
@@ -331,7 +330,6 @@ proc toWaku2Config*(jsonObj: JsonNode): Waku2Config =
   discard jsonObj.getProp("StoreCapacity", result.StoreCapacity)
   discard jsonObj.getProp("StoreSeconds", result.StoreSeconds)
   discard jsonObj.getProp("EnableFilterFullNode", result.EnableFilterFullNode)
-  discard jsonObj.getProp("UseShardAsDefaultTopic", result.UseShardAsDefaultTopic)
 
 proc toWakuConfig*(jsonObj: JsonNode): WakuConfig =
   discard jsonObj.getProp("Enabled", result.Enabled)

src/app_service/service/node_configuration/service.nim

@@ -113,10 +113,6 @@ proc getBloomLevel*(self: Service): string =
     else:
       return BLOOM_LEVEL_LIGHT
 
-proc isShardFleet(config: NodeConfigDto): bool =
-  return case config.ClusterConfig.Fleet:
-    of $Fleet.ShardsTest: true
-    else: false
 
 proc setWakuConfig(configuration: NodeConfigDto, wakuVersion: int): NodeConfigDto =
   var newConfiguration = configuration
@@ -133,7 +129,6 @@ proc setWakuConfig(configuration: NodeConfigDto, wakuVersion: int): NodeConfigDt
     newConfiguration.WakuV2Config.EnableDiscV5 = true
     newConfiguration.WakuV2Config.DiscoveryLimit = 20
     newConfiguration.WakuV2Config.Rendezvous = true
-    newConfiguration.WakuV2Config.UseShardAsDefaultTopic = isShardFleet(newConfiguration)
 
   return newConfiguration
 
@@ -235,18 +230,11 @@ proc setFleet*(self: Service, fleet: string): bool =
       dnsDiscoveryURL.add("enrtree://AIO6LUM3IVWCU2KCPBBI6FEH2W42IGK3ASCZHZGG5TIXUR56OGQUO@test.status.nodes.status.im")
     of Fleet.StatusProd:
       dnsDiscoveryURL.add("enrtree://AL65EKLJAUXKKPG43HVTML5EFFWEZ7L4LOKTLZCLJASG4DSESQZEC@prod.status.nodes.status.im")
-    of Fleet.ShardsTest:
-      dnsDiscoveryURL.add("enrtree://AMOJVZX4V6EXP7NTJPMAYJYST2QP6AJXYW76IU6VGJS7UVSNDYZG4@boot.test.shards.nodes.status.im")
     else:
       wakuVersion = 1
 
   newConfiguration.ClusterConfig.WakuNodes = dnsDiscoveryURL
-
-  var discV5Bootnodes = self.fleetConfiguration.getNodes(fleetType, FleetNodes.WakuENR)
-  if dnsDiscoveryURL.len != 0:
-    discV5Bootnodes.add(dnsDiscoveryURL[0])
-
-  newConfiguration.ClusterConfig.DiscV5BootstrapNodes = discV5Bootnodes
+  newConfiguration.ClusterConfig.DiscV5BootstrapNodes = dnsDiscoveryURL
 
   newConfiguration = setWakuConfig(newConfiguration, wakuVersion)
 

src/app_service/service/settings/dto/settings.nim

@@ -90,7 +90,6 @@ type PinnedMailserver* = object
   goWakuTest*: string
   statusTest*: string
   statusProd*: string
-  shardsTest*: string
 
 type CurrentUserStatus* = object
   statusType*: StatusType
@@ -164,7 +163,6 @@ proc toPinnedMailserver*(jsonObj: JsonNode): PinnedMailserver =
   discard jsonObj.getProp("go-waku.test", result.goWakuTest)
   discard jsonObj.getProp("status.test", result.statusTest)
   discard jsonObj.getProp("status.prod", result.statusProd)
-  discard jsonObj.getProp("shards.test", result.shardsTest)
 
 proc toCurrentUserStatus*(jsonObj: JsonNode): CurrentUserStatus =
   var statusTypeInt: int

src/app_service/service/settings/service.nim

@@ -418,8 +418,6 @@ QtObject:
       return self.settings.pinnedMailserver.statusTest
     elif (fleet == Fleet.StatusProd):
       return self.settings.pinnedMailserver.statusProd
-    elif (fleet == Fleet.ShardsTest):
-      return self.settings.pinnedMailserver.shardsTest
     return ""
 
   proc pinMailserver*(self: Service, mailserverID: string, fleet: Fleet): bool =
@@ -440,8 +438,6 @@ QtObject:
         self.settings.pinnedMailserver.statusTest = mailserverID
       elif (fleet == Fleet.StatusProd):
         self.settings.pinnedMailserver.statusProd = mailserverID
-      elif (fleet == Fleet.ShardsTest):
-        self.settings.pinnedMailserver.shardsTest = mailserverID
       return true
     return false
 

ui/app/AppLayouts/Profile/popups/FleetsModal.qml

@@ -64,11 +64,5 @@ ModalPopup {
             fleetName: Constants.status_prod
             buttonGroup: fleetSettings
         }
-
-        FleetRadioSelector {
-            advancedStore: popup.advancedStore
-            fleetName: Constants.shards_test
-            buttonGroup: fleetSettings
-        }
     }
 }

ui/app/AppLayouts/Profile/stores/AdvancedStore.qml

@@ -24,8 +24,7 @@ QtObject {
     property bool isWakuV2: root.fleet === Constants.waku_prod   ||
                             root.fleet === Constants.waku_test   ||
                             root.fleet === Constants.status_test ||
-                            root.fleet === Constants.status_prod ||
-                            root.fleet === Constants.shards_test
+                            root.fleet === Constants.status_prod
 
     readonly property bool isFakeLoadingScreenEnabled: localAppSettings.fakeLoadingScreenEnabled ?? false
     property bool isManageCommunityOnTestModeEnabled: false

ui/imports/utils/Constants.qml

@@ -924,7 +924,6 @@ QtObject {
     readonly property string waku_test: "wakuv2.test"
     readonly property string status_test: "status.test"
     readonly property string status_prod: "status.prod"
-    readonly property string shards_test: "shards.test"
 
     readonly property int browserSearchEngineNone: 0
     readonly property int browserSearchEngineGoogle: 1