fixes for never go-micro (#525)

* broker/http: is in go-micro core
* registry/gossip: fix for never go-micro

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

gossip.go

@@ -19,6 +19,7 @@ import (
 	"github.com/micro/go-micro/v2/config/cmd"
 	log "github.com/micro/go-micro/v2/logger"
 	"github.com/micro/go-micro/v2/registry"
+	regutil "github.com/micro/go-micro/v2/util/registry"
 	pb "github.com/micro/go-plugins/registry/gossip/v2/proto"
 	"github.com/mitchellh/hashstructure"
 )
@@ -631,7 +632,7 @@ func (g *gossipRegistry) run() {
 				g.services[u.Service.Name] = []*registry.Service{u.Service}
 
 			} else {
-				g.services[u.Service.Name] = registry.Merge(service, []*registry.Service{u.Service})
+				g.services[u.Service.Name] = regutil.Merge(service, []*registry.Service{u.Service})
 			}
 			g.Unlock()
 
@@ -650,7 +651,7 @@ func (g *gossipRegistry) run() {
 		case actionTypeDelete:
 			g.Lock()
 			if service, ok := g.services[u.Service.Name]; ok {
-				if services := registry.Remove(service, []*registry.Service{u.Service}); len(services) == 0 {
+				if services := regutil.Remove(service, []*registry.Service{u.Service}); len(services) == 0 {
 					delete(g.services, u.Service.Name)
 				} else {
 					g.services[u.Service.Name] = services
@@ -713,7 +714,7 @@ func (g *gossipRegistry) Register(s *registry.Service, opts ...registry.Register
 	if service, ok := g.services[s.Name]; !ok {
 		g.services[s.Name] = []*registry.Service{s}
 	} else {
-		g.services[s.Name] = registry.Merge(service, []*registry.Service{s})
+		g.services[s.Name] = regutil.Merge(service, []*registry.Service{s})
 	}
 	g.Unlock()
 
@@ -764,7 +765,7 @@ func (g *gossipRegistry) Deregister(s *registry.Service) error {
 
 	g.Lock()
 	if service, ok := g.services[s.Name]; ok {
-		if services := registry.Remove(service, []*registry.Service{s}); len(services) == 0 {
+		if services := regutil.Remove(service, []*registry.Service{s}); len(services) == 0 {
 			delete(g.services, s.Name)
 		} else {
 			g.services[s.Name] = services