From aa101624c2a49f5ea59406a240a226fc1b14d14e Mon Sep 17 00:00:00 2001
From: Asim Aslam <asim@aslam.me>
Date: Mon, 8 Jul 2019 08:43:21 +0100
Subject: [PATCH] Fix breaks related to removing node.port

---
 http.go      | 13 -------------
 http_test.go | 19 ++-----------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/http.go b/http.go
index fb712d9..1d692e7 100644
--- a/http.go
+++ b/http.go
@@ -57,10 +57,6 @@ func (h *httpClient) next(request client.Request, opts client.CallOptions) (sele
 func (h *httpClient) call(ctx context.Context, node *registry.Node, req client.Request, rsp interface{}, opts client.CallOptions) error {
 	// set the address
 	address := node.Address
-	if node.Port > 0 {
-		address = fmt.Sprintf("%s:%d", address, node.Port)
-	}
-
 	header := make(http.Header)
 	if md, ok := metadata.FromContext(ctx); ok {
 		for k, v := range md {
@@ -125,10 +121,6 @@ func (h *httpClient) call(ctx context.Context, node *registry.Node, req client.R
 func (h *httpClient) stream(ctx context.Context, node *registry.Node, req client.Request, opts client.CallOptions) (client.Stream, error) {
 	// set the address
 	address := node.Address
-	if node.Port > 0 {
-		address = fmt.Sprintf("%s:%d", address, node.Port)
-	}
-
 	header := make(http.Header)
 	if md, ok := metadata.FromContext(ctx); ok {
 		for k, v := range md {
@@ -351,11 +343,6 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 			return nil, errors.InternalServerError("go.micro.client", err.Error())
 		}
 
-		addr := node.Address
-		if node.Port > 0 {
-			addr = fmt.Sprintf("%s:%d", addr, node.Port)
-		}
-
 		stream, err := h.stream(ctx, node, req, callOpts)
 		h.opts.Selector.Mark(req.Service(), node, err)
 		return stream, err
diff --git a/http_test.go b/http_test.go
index f977540..51eb31a 100644
--- a/http_test.go
+++ b/http_test.go
@@ -8,7 +8,6 @@ import (
 	"io/ioutil"
 	"net"
 	"net/http"
-	"strconv"
 	"testing"
 
 	"github.com/micro/go-micro/client"
@@ -68,19 +67,12 @@ func TestHTTPClient(t *testing.T) {
 	})
 	go http.Serve(l, mux)
 
-	host, sport, err := net.SplitHostPort(l.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	port, _ := strconv.Atoi(sport)
-
 	if err := r.Register(&registry.Service{
 		Name: "test.service",
 		Nodes: []*registry.Node{
 			{
 				Id:      "test.service.1",
-				Address: host,
-				Port:    port,
+				Address: l.Addr().String(),
 			},
 		},
 	}); err != nil {
@@ -231,19 +223,12 @@ func TestHTTPClientStream(t *testing.T) {
 	})
 	go http.Serve(l, mux)
 
-	host, sport, err := net.SplitHostPort(l.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	port, _ := strconv.Atoi(sport)
-
 	if err := r.Register(&registry.Service{
 		Name: "test.service",
 		Nodes: []*registry.Node{
 			{
 				Id:      "test.service.1",
-				Address: host,
-				Port:    port,
+				Address: l.Addr().String(),
 			},
 		},
 	}); err != nil {