From 5b327ce72374615404e2fac8c73aaaa7066ca22c Mon Sep 17 00:00:00 2001
From: Asim Aslam <asim@aslam.me>
Date: Sun, 28 Jul 2019 20:00:09 +0100
Subject: [PATCH] change id to name in resolver

---
 network/resolver/dns/dns.go           | 6 +++---
 network/resolver/http/http.go         | 8 ++++----
 network/resolver/registry/registry.go | 6 +++---
 network/resolver/resolver.go          | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/network/resolver/dns/dns.go b/network/resolver/dns/dns.go
index c905df0e..ba109656 100644
--- a/network/resolver/dns/dns.go
+++ b/network/resolver/dns/dns.go
@@ -1,4 +1,4 @@
-// Package dns resolves ids to dns srv records
+// Package dns resolves names to dns srv records
 package dns
 
 import (
@@ -11,8 +11,8 @@ import (
 type Resolver struct{}
 
 // Resolve assumes ID is a domain name e.g micro.mu
-func (r *Resolver) Resolve(id string) ([]*resolver.Record, error) {
-	_, addrs, err := net.LookupSRV("network", "udp", id)
+func (r *Resolver) Resolve(name string) ([]*resolver.Record, error) {
+	_, addrs, err := net.LookupSRV("network", "udp", name)
 	if err != nil {
 		return nil, err
 	}
diff --git a/network/resolver/http/http.go b/network/resolver/http/http.go
index 80ff4d61..b6025a59 100644
--- a/network/resolver/http/http.go
+++ b/network/resolver/http/http.go
@@ -1,4 +1,4 @@
-// Package http resolves ids to network addresses using a http request
+// Package http resolves names to network addresses using a http request
 package http
 
 import (
@@ -18,8 +18,8 @@ type Resolver struct {
 	Path string
 }
 
-// Resolve assumes ID is a domain which can be converted to a http://id/network request
-func (r *Resolver) Resolve(id string) ([]*resolver.Record, error) {
+// Resolve assumes ID is a domain which can be converted to a http://name/network request
+func (r *Resolver) Resolve(name string) ([]*resolver.Record, error) {
 	proto := "http"
 	path := "/network"
 
@@ -34,7 +34,7 @@ func (r *Resolver) Resolve(id string) ([]*resolver.Record, error) {
 	uri := &url.URL{
 		Scheme: proto,
 		Path:   path,
-		Host:   id,
+		Host:   name,
 	}
 
 	rsp, err := http.Get(uri.String())
diff --git a/network/resolver/registry/registry.go b/network/resolver/registry/registry.go
index c7ef796a..9fe80bc5 100644
--- a/network/resolver/registry/registry.go
+++ b/network/resolver/registry/registry.go
@@ -1,4 +1,4 @@
-// Package registry resolves ids using the go-micro registry
+// Package registry resolves names using the go-micro registry
 package registry
 
 import (
@@ -12,13 +12,13 @@ type Resolver struct {
 }
 
 // Resolve assumes ID is a domain name e.g micro.mu
-func (r *Resolver) Resolve(id string) ([]*resolver.Record, error) {
+func (r *Resolver) Resolve(name string) ([]*resolver.Record, error) {
 	reg := r.Registry
 	if reg == nil {
 		reg = registry.DefaultRegistry
 	}
 
-	services, err := reg.GetService(id)
+	services, err := reg.GetService(name)
 	if err != nil {
 		return nil, err
 	}
diff --git a/network/resolver/resolver.go b/network/resolver/resolver.go
index 6c54eb95..2eb0b2a2 100644
--- a/network/resolver/resolver.go
+++ b/network/resolver/resolver.go
@@ -1,12 +1,12 @@
-// Package resolver resolves network ids to addresses
+// Package resolver resolves network names to addresses
 package resolver
 
 // Resolver is network resolver. It's used to find network nodes
-// via id to connect to. This is done based on Network.Id().
+// via the name to connect to. This is done based on Network.Name().
 // Before we can be part of any network, we have to connect to it.
 type Resolver interface {
-	// Resolve returns a list of addresses for an id
-	Resolve(id string) ([]*Record, error)
+	// Resolve returns a list of addresses for an name
+	Resolve(name string) ([]*Record, error)
 }
 
 // A resolved record