From bc66ccb9d39b5cb27ab63f7a7ba528250a6d7056 Mon Sep 17 00:00:00 2001
From: Vasiliy Tolstov <v.tolstov@unistack.org>
Date: Fri, 9 Oct 2020 17:47:48 +0300
Subject: [PATCH] use helper

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
---
 grpc.go | 37 ++-----------------------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

diff --git a/grpc.go b/grpc.go
index b36ee71..818038d 100644
--- a/grpc.go
+++ b/grpc.go
@@ -21,10 +21,8 @@ import (
 	meta "github.com/unistack-org/micro/v3/metadata"
 	"github.com/unistack-org/micro/v3/registry"
 	"github.com/unistack-org/micro/v3/server"
-	"github.com/unistack-org/micro/v3/util/addr"
 	"github.com/unistack-org/micro/v3/util/backoff"
 	mgrpc "github.com/unistack-org/micro/v3/util/grpc"
-	mnet "github.com/unistack-org/micro/v3/util/net"
 	regutil "github.com/unistack-org/micro/v3/util/registry"
 	"golang.org/x/net/netutil"
 	"google.golang.org/grpc"
@@ -819,49 +817,18 @@ func (g *grpcServer) Register() error {
 
 func (g *grpcServer) Deregister() error {
 	var err error
-	var advt, host, port string
 
 	g.RLock()
 	config := g.opts
 	g.RUnlock()
 
-	// check the advertise address first
-	// if it exists then use it, otherwise
-	// use the address
-	if len(config.Advertise) > 0 {
-		advt = config.Advertise
-	} else {
-		advt = config.Address
-	}
-
-	if cnt := strings.Count(advt, ":"); cnt >= 1 {
-		// ipv6 address in format [host]:port or ipv4 host:port
-		host, port, err = net.SplitHostPort(advt)
-		if err != nil {
-			return err
-		}
-	} else {
-		host = advt
-	}
-
-	addr, err := addr.Extract(host)
+	service, err := regutil.NewService(g)
 	if err != nil {
 		return err
 	}
 
-	node := &registry.Node{
-		Id:      config.Name + "-" + config.Id,
-		Address: mnet.HostPort(addr, port),
-	}
-
-	service := &registry.Service{
-		Name:    config.Name,
-		Version: config.Version,
-		Nodes:   []*registry.Node{node},
-	}
-
 	if logger.V(logger.InfoLevel) {
-		logger.Infof("Deregistering node: %s", node.Id)
+		logger.Infof("Deregistering node: %s", service.Nodes[0].Id)
 	}
 
 	opt := registry.DeregisterDomain(g.opts.Namespace)