Merge "core: Change runtime.NewEndpoint to veyron2.NewEndpoint."
diff --git a/services/mounttable/lib/mounttable.go b/services/mounttable/lib/mounttable.go
index d1fc1bc..7c85c71 100644
--- a/services/mounttable/lib/mounttable.go
+++ b/services/mounttable/lib/mounttable.go
@@ -396,8 +396,7 @@
// Make sure the server name is reasonable.
epString, _ := naming.SplitAddressName(server)
- runtime := veyron2.RuntimeFromContext(ctx.Context())
- _, err := runtime.NewEndpoint(epString)
+ _, err := veyron2.NewEndpoint(epString)
if err != nil {
return fmt.Errorf("malformed address %q for mounted server %q", epString, server)
}
diff --git a/services/mounttable/lib/neighborhood.go b/services/mounttable/lib/neighborhood.go
index 3cc6952..32e6193 100644
--- a/services/mounttable/lib/neighborhood.go
+++ b/services/mounttable/lib/neighborhood.go
@@ -38,10 +38,10 @@
nh *neighborhood
}
-func getPort(r veyron2.Runtime, address string) uint16 {
+func getPort(address string) uint16 {
epAddr, _ := naming.SplitAddressName(address)
- ep, err := r.NewEndpoint(epAddr)
+ ep, err := veyron2.NewEndpoint(epAddr)
if err != nil {
return 0
}
@@ -63,14 +63,14 @@
return uint16(port)
}
-func newNeighborhoodServer(r veyron2.Runtime, host string, addresses []string, loopback bool) (*neighborhood, error) {
+func newNeighborhoodServer(host string, addresses []string, loopback bool) (*neighborhood, error) {
// Create the TXT contents with addresses to announce. Also pick up a port number.
var txt []string
var port uint16
for _, addr := range addresses {
txt = append(txt, addressPrefix+addr)
if port == 0 {
- port = getPort(r, addr)
+ port = getPort(addr)
}
}
if txt == nil {
@@ -114,13 +114,13 @@
}
// NewLoopbackNeighborhoodServer creates a new instance of a neighborhood server on loopback interfaces for testing.
-func NewLoopbackNeighborhoodServer(r veyron2.Runtime, host string, addresses ...string) (*neighborhood, error) {
- return newNeighborhoodServer(r, host, addresses, true)
+func NewLoopbackNeighborhoodServer(host string, addresses ...string) (*neighborhood, error) {
+ return newNeighborhoodServer(host, addresses, true)
}
// NewNeighborhoodServer creates a new instance of a neighborhood server.
-func NewNeighborhoodServer(r veyron2.Runtime, host string, addresses ...string) (*neighborhood, error) {
- return newNeighborhoodServer(r, host, addresses, false)
+func NewNeighborhoodServer(host string, addresses ...string) (*neighborhood, error) {
+ return newNeighborhoodServer(host, addresses, false)
}
// Lookup implements ipc.Dispatcher.Lookup.
diff --git a/services/mounttable/lib/neighborhood_test.go b/services/mounttable/lib/neighborhood_test.go
index 345f2ec..89ffd85 100644
--- a/services/mounttable/lib/neighborhood_test.go
+++ b/services/mounttable/lib/neighborhood_test.go
@@ -49,7 +49,7 @@
serverName := fmt.Sprintf("nhtest%d", os.Getpid())
// Add neighborhood server.
- nhd, err := NewLoopbackNeighborhoodServer(rootRT, serverName, addresses...)
+ nhd, err := NewLoopbackNeighborhoodServer(serverName, addresses...)
if err != nil {
boom(t, "Failed to create neighborhood server: %s\n", err)
}
diff --git a/services/mounttable/mounttabled/mounttable.go b/services/mounttable/mounttabled/mounttable.go
index 5c3fe2c..8fc0b50 100644
--- a/services/mounttable/mounttabled/mounttable.go
+++ b/services/mounttable/mounttabled/mounttable.go
@@ -79,7 +79,7 @@
myObjectName := naming.JoinAddressName(mtEndpoint.String(), "")
- nh, err := mounttable.NewNeighborhoodServer(r, *nhName, myObjectName)
+ nh, err := mounttable.NewNeighborhoodServer(*nhName, myObjectName)
if err != nil {
vlog.Errorf("NewNeighborhoodServer failed: %v", err)
os.Exit(1)
