wspr: Change runtime.NewEndpoint to veyron2.NewEndpoint.
Change-Id: I88052b624de704989dca4d7c810b5f6ca9d94612
MultiPart: 2/2
diff --git a/services/wsprd/browspr/browspr_test.go b/services/wsprd/browspr/browspr_test.go
index cb29fd4..cdd8e0b 100644
--- a/services/wsprd/browspr/browspr_test.go
+++ b/services/wsprd/browspr/browspr_test.go
@@ -153,7 +153,7 @@
vlog.Fatalf("rt.New failed: %s", err)
}
defer runtime.Cleanup()
- wsNamespaceRoots, err := lib.EndpointsToWs(runtime, []string{tcpNamespaceRoot})
+ wsNamespaceRoots, err := lib.EndpointsToWs([]string{tcpNamespaceRoot})
if err != nil {
vlog.Fatal(err)
}
diff --git a/services/wsprd/browspr/main/main_nacl.go b/services/wsprd/browspr/main/main_nacl.go
index c98ff67..7e6c736 100644
--- a/services/wsprd/browspr/main/main_nacl.go
+++ b/services/wsprd/browspr/main/main_nacl.go
@@ -221,7 +221,7 @@
}
// TODO(ataly, bprosnitz, caprita): The runtime MUST be cleaned up
// after use. Figure out the appropriate place to add the Cleanup call.
- wsNamespaceRoots, err := lib.EndpointsToWs(runtime, []string{msg.NamespaceRoot})
+ wsNamespaceRoots, err := lib.EndpointsToWs([]string{msg.NamespaceRoot})
if err != nil {
return nil, err
}
diff --git a/services/wsprd/lib/ws_endpoint.go b/services/wsprd/lib/ws_endpoint.go
index 9177c96..9479c7b 100644
--- a/services/wsprd/lib/ws_endpoint.go
+++ b/services/wsprd/lib/ws_endpoint.go
@@ -9,12 +9,12 @@
)
// Turns a list of names into a list of names that use the "ws" protocol.
-func EndpointsToWs(rt veyron2.Runtime, names []string) ([]string, error) {
+func EndpointsToWs(names []string) ([]string, error) {
outNames := []string{}
tcpRegexp := regexp.MustCompile(`@tcp\d*@`)
for _, name := range names {
addr, suff := naming.SplitAddressName(name)
- ep, err := rt.NewEndpoint(addr)
+ ep, err := veyron2.NewEndpoint(addr)
if err != nil {
return nil, fmt.Errorf("rt.NewEndpoint(%v) failed: %v", addr, err)
}
diff --git a/services/wsprd/lib/ws_endpoint_test.go b/services/wsprd/lib/ws_endpoint_test.go
index 7299f5c..260fa9d 100644
--- a/services/wsprd/lib/ws_endpoint_test.go
+++ b/services/wsprd/lib/ws_endpoint_test.go
@@ -2,14 +2,9 @@
import (
"testing"
- "v.io/core/veyron2/rt"
)
func TestWsNames(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- t.Fatalf("rt.New() failed: %v", err)
- }
testdata := map[string]string{
"/@3@tcp@127.0.0.1:46504@d7b41510a6e78033ed86e38efb61ef52@4@6@m@@": "/@3@ws@127.0.0.1:46504@d7b41510a6e78033ed86e38efb61ef52@4@6@m@@",
"/@3@tcp4@example.com:46504@d7b41510a6e78033ed86e38efb61ef52@4@6@m@@/more/stuff": "/@3@ws@example.com:46504@d7b41510a6e78033ed86e38efb61ef52@4@6@m@@/more/stuff",
@@ -22,7 +17,7 @@
for name, expectedWsName := range testdata {
inputNames := []string{name}
- actualWsNames, err := EndpointsToWs(runtime, inputNames)
+ actualWsNames, err := EndpointsToWs(inputNames)
if err != nil {
t.Fatal(err)
}
diff --git a/services/wsprd/namespace/request_handler.go b/services/wsprd/namespace/request_handler.go
index 71b5d97..6753ddd 100644
--- a/services/wsprd/namespace/request_handler.go
+++ b/services/wsprd/namespace/request_handler.go
@@ -13,7 +13,7 @@
)
// Function to format endpoints. Used by browspr to swap 'tcp' for 'ws'.
-var EpFormatter func(veyron2.Runtime, []string) ([]string, error) = nil
+var EpFormatter func([]string) ([]string, error) = nil
// request struct represents a request to call a method on the runtime's namespace client
type request struct {
@@ -110,7 +110,7 @@
case methodRoots:
roots(ctx, ns, w)
case methodSetRoots:
- setRoots(ctx, ns, rt, w, req.Args)
+ setRoots(ctx, ns, w, req.Args)
default:
w.Error(verror2.Make(verror2.NoExist, ctx, req.Method))
}
@@ -286,7 +286,7 @@
}
}
-func setRoots(ctx *context.T, ns naming.Namespace, rt veyron2.Runtime, w lib.ClientWriter, rawArgs json.RawMessage) {
+func setRoots(ctx *context.T, ns naming.Namespace, w lib.ClientWriter, rawArgs json.RawMessage) {
var args setRootsArgs
if err := json.Unmarshal([]byte(rawArgs), &args); err != nil {
w.Error(verror2.Convert(verror2.Internal, ctx, err))
@@ -296,7 +296,7 @@
var formattedRoots []string
var err error
if EpFormatter != nil {
- formattedRoots, err = EpFormatter(rt, args.Roots)
+ formattedRoots, err = EpFormatter(args.Roots)
if err != nil {
w.Error(verror2.Convert(verror2.Internal, ctx, err))
}
