chore(fleets)_: reuse api.DefaultFleet in GetFleet()

fixes #5381

api/defaults.go

@@ -41,8 +41,6 @@ const DefaultVerifyTransactionChainID = 1
 
 var paths = []string{pathWalletRoot, pathEIP1581, pathDefaultChat, pathDefaultWallet, pathEncryption}
 
-var DefaultFleet = params.FleetShardsTest
-
 var overrideApiConfig = overrideApiConfigProd
 
 func defaultSettings(keyUID string, address string, derivedAddresses map[string]generator.AccountInfo) (*settings.Settings, error) {
@@ -127,7 +125,7 @@ func defaultSettings(keyUID string, address string, derivedAddresses map[string]
 }
 
 func SetDefaultFleet(nodeConfig *params.NodeConfig) error {
-	return SetFleet(DefaultFleet, nodeConfig)
+	return SetFleet(params.DefaultFleet, nodeConfig)
 }
 
 func SetFleet(fleet string, nodeConfig *params.NodeConfig) error {

api/geth_backend.go

@@ -724,8 +724,8 @@ func (b *GethStatusBackend) UpdateNodeConfigFleet(acc multiaccounts.Account, pas
 	if !params.IsFleetSupported(fleet) {
 		b.log.Warn("fleet is not supported, overriding with default value",
 			"fleet", fleet,
-			"defaultFleet", DefaultFleet)
-		fleet = DefaultFleet
+			"defaultFleet", params.DefaultFleet)
+		fleet = params.DefaultFleet
 	}
 
 	err = SetFleet(fleet, config)

cmd/statusd/main.go

@@ -67,7 +67,7 @@ var (
 	)
 	fleet = flag.String(
 		"fleet",
-		params.FleetShardsTest,
+		params.DefaultFleet,
 		fmt.Sprintf(
 			"Select fleet: %s (default %s)",
 			[]string{
@@ -76,7 +76,7 @@ var (
 				params.FleetWakuSandbox,
 				params.FleetWakuTest,
 			},
-			params.FleetShardsTest,
+			params.DefaultFleet,
 		),
 	)
 	listenAddr = flag.String("addr", "", "address to bind listener to")

mobile/status.go

@@ -1066,7 +1066,7 @@ type FleetDescription struct {
 
 func Fleets() string {
 	fleets := FleetDescription{
-		DefaultFleet: api.DefaultFleet,
+		DefaultFleet: params.DefaultFleet,
 		Fleets:       params.GetSupportedFleets(),
 	}
 

params/cluster.go

@@ -8,6 +8,7 @@ const (
 	FleetWakuSandbox   = "waku.sandbox"
 	FleetWakuTest      = "waku.test"
 )
+const DefaultFleet = FleetShardsTest
 
 // Cluster defines a list of Ethereum nodes.
 type Cluster struct {

params/config_test.go

@@ -20,7 +20,7 @@ func TestNewNodeConfigWithDefaults(t *testing.T) {
 	c, err := params.NewNodeConfigWithDefaults(
 		"/some/data/path",
 		params.GoerliNetworkID,
-		params.WithFleet(params.FleetShardsTest),
+		params.WithFleet(params.FleetShardsTest), // see config/cli/fleet-shards.test.json
 		params.WithLES(),
 		params.WithMailserver(),
 	)
@@ -33,10 +33,10 @@ func TestNewNodeConfigWithDefaults(t *testing.T) {
 	// assert MailServer
 	assert.Equal(t, false, c.WakuConfig.EnableMailServer)
 	// assert cluster
-	assert.Equal(t, false, c.NoDiscovery)
+	assert.Equal(t, true, c.NoDiscovery)
 	assert.Equal(t, params.FleetShardsTest, c.ClusterConfig.Fleet)
-	assert.NotEmpty(t, c.ClusterConfig.BootNodes)
-	assert.NotEmpty(t, c.ClusterConfig.StaticNodes)
+	assert.Empty(t, c.ClusterConfig.BootNodes)
+	assert.Empty(t, c.ClusterConfig.StaticNodes)
 	assert.NotEmpty(t, c.ClusterConfig.PushNotificationsServers)
 	// assert LES
 	assert.Equal(t, true, c.LightEthConfig.Enabled)

protocol/messenger_mailserver_cycle.go

@@ -172,7 +172,7 @@ func (m *Messenger) getFleet() (string, error) {
 	} else if m.config.clusterConfig.Fleet != "" {
 		fleet = m.config.clusterConfig.Fleet
 	} else {
-		fleet = params.FleetShardsTest
+		fleet = params.DefaultFleet
 	}
 	return fleet, nil
 }