Rendezvous should be false if list of nodes is empty

We can disable this validation in status-go. I am not sure why we have it.
But it will take longer.

Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
This commit is contained in:
Dmitry 2018-11-21 15:52:23 +02:00 committed by Igor Mandrigin
parent a5c5e1831f
commit 7a0fc763a4
No known key found for this signature in database
GPG Key ID: 4A0EDDE26E66BC8B
1 changed files with 3 additions and 2 deletions

View File

@ -72,6 +72,7 @@
(let [accounts (get db :accounts/accounts) (let [accounts (get db :accounts/accounts)
current-fleet-key (fleet/current-fleet db address) current-fleet-key (fleet/current-fleet db address)
current-fleet (get fleet/fleets current-fleet-key) current-fleet (get fleet/fleets current-fleet-key)
rendezvous-nodes (pick-nodes 3 (vals (:rendezvous current-fleet)))
{:keys [network {:keys [network
installation-id installation-id
settings settings
@ -86,13 +87,13 @@
current-fleet current-fleet
(assoc :NoDiscovery false (assoc :NoDiscovery false
:Rendezvous true :Rendezvous (not (empty? rendezvous-nodes))
:ClusterConfig {:Enabled true :ClusterConfig {:Enabled true
:Fleet (name current-fleet-key) :Fleet (name current-fleet-key)
:BootNodes (pick-nodes 4 (vals (:boot current-fleet))) :BootNodes (pick-nodes 4 (vals (:boot current-fleet)))
:TrustedMailServers (pick-nodes 6 (vals (:mail current-fleet))) :TrustedMailServers (pick-nodes 6 (vals (:mail current-fleet)))
:StaticNodes (pick-nodes 2 (vals (:whisper current-fleet))) :StaticNodes (pick-nodes 2 (vals (:whisper current-fleet)))
:RendezvousNodes (pick-nodes 3 (vals (:rendezvous current-fleet)))}) :RendezvousNodes rendezvous-nodes})
:always :always
(assoc :WhisperConfig {:Enabled true (assoc :WhisperConfig {:Enabled true