From 201e851511b42c079c7dc0dcb1f5ef4dd615a95a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Podg=C3=B3rski?= <kuba--@users.noreply.github.com>
Date: Thu, 14 Jan 2021 20:04:09 +0100
Subject: [PATCH] set more ports for Node Command

---
 server/cluster_test.go | 45 +++++++++++++++++++++++++++++++-----------
 server/server.go       |  4 ----
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/server/cluster_test.go b/server/cluster_test.go
index 046f4ef05..3a94ec13b 100644
--- a/server/cluster_test.go
+++ b/server/cluster_test.go
@@ -185,10 +185,15 @@ func TestClusterResize_AddNode(t *testing.T) {
 
 		m1.Config.Gossip.Seeds = []string{seed}
 
-		if err := port.GetPort(func(p int) error {
-			m1.Config.Gossip.Port = fmt.Sprintf("%d", p)
+		if err := port.GetPorts(func(ports []int) error {
+			portsCfg := test.GenPortsConfig(test.NewPorts(ports))
+
+			m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
+			m1.Config.DisCo = portsCfg[0].DisCo
+			m1.Config.BindGRPC = portsCfg[0].BindGRPC
+
 			return m1.Start()
-		}, 10); err != nil {
+		}, 4, 10); err != nil {
 			t.Fatalf("starting second main: %v", err)
 		}
 		defer m1.Close()
@@ -237,10 +242,15 @@ func TestClusterResize_AddNode(t *testing.T) {
 
 		m1.Config.Gossip.Seeds = []string{seed}
 
-		if err := port.GetPort(func(p int) error {
-			m1.Config.Gossip.Port = fmt.Sprintf("%d", p)
+		if err := port.GetPorts(func(ports []int) error {
+			portsCfg := test.GenPortsConfig(test.NewPorts(ports))
+
+			m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
+			m1.Config.DisCo = portsCfg[0].DisCo
+			m1.Config.BindGRPC = portsCfg[0].BindGRPC
+
 			return m1.Start()
-		}, 10); err != nil {
+		}, 4, 10); err != nil {
 			t.Fatalf("starting second main: %v", err)
 		}
 		defer m1.Close()
@@ -288,10 +298,15 @@ func TestClusterResize_AddNode(t *testing.T) {
 		m1 := test.NewCommandNode(t, false)
 		m1.Config.Gossip.Seeds = []string{seed}
 
-		if err := port.GetPort(func(p int) error {
-			m1.Config.Gossip.Port = fmt.Sprintf("%d", p)
+		if err := port.GetPorts(func(ports []int) error {
+			portsCfg := test.GenPortsConfig(test.NewPorts(ports))
+
+			m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
+			m1.Config.DisCo = portsCfg[0].DisCo
+			m1.Config.BindGRPC = portsCfg[0].BindGRPC
+
 			return m1.Start()
-		}, 10); err != nil {
+		}, 4, 10); err != nil {
 			t.Fatalf("starting second main: %v", err)
 		}
 		defer m1.Close()
@@ -345,12 +360,18 @@ func TestClusterResize_AddNode(t *testing.T) {
 		m1 := test.NewCommandNode(t, false)
 		m1.Config.Gossip.Seeds = []string{seed}
 
-		if err := port.GetPort(func(p int) error {
-			m1.Config.Gossip.Port = fmt.Sprintf("%d", p)
+		if err := port.GetPorts(func(ports []int) error {
+			portsCfg := test.GenPortsConfig(test.NewPorts(ports))
+
+			m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
+			m1.Config.DisCo = portsCfg[0].DisCo
+			m1.Config.BindGRPC = portsCfg[0].BindGRPC
+
 			return m1.Start()
-		}, 10); err != nil {
+		}, 4, 10); err != nil {
 			t.Fatalf("starting second main: %v", err)
 		}
+
 		defer m1.Close()
 
 		if !test.CheckClusterState(m0, pilosa.ClusterStateNormal, 1000) {
diff --git a/server/server.go b/server/server.go
index 62dfdf8b6..defe38c25 100644
--- a/server/server.go
+++ b/server/server.go
@@ -329,10 +329,6 @@ func (m *Command) SetupServer() error {
 	}
 
 	// create gRPC listener
-
-	if grpcURI.Port == 0 {
-		return fmt.Errorf("server/server.go: must configure grpcURI as non-zero Port, else test's port-mapper won't function")
-	}
 	m.grpcLn, err = net.Listen("tcp", grpcURI.HostPort())
 	if err != nil {
 		return errors.Wrap(err, "creating grpc listener")