TBR: ListenX to Listen - fix the build.
Change-Id: I251238ea32e6c86b498ef4476790af6779bdad96
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index 02bcaaf..96a97d5 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -144,7 +144,7 @@
return nil, nil, err
}
- endpoint, err := s.Listen("tcp", "127.0.0.1:0")
+ endpoint, err := s.Listen(profiles.LocalListenSpec)
if err != nil {
return nil, nil, err
}
@@ -201,7 +201,7 @@
return
}
defer s.Stop()
- spec := *profiles.LocalListenSpec
+ spec := profiles.LocalListenSpec
spec.Proxy = "mockVeyronProxyEP"
controller, err := NewController(nil, &spec, options.ForceNewSecurityModel{}, options.RuntimePrincipal{newBlessedPrincipal(r)})
@@ -236,7 +236,8 @@
return
}
defer s.Stop()
- spec := *profiles.LocalListenSpec
+
+ spec := profiles.LocalListenSpec
spec.Proxy = "mockVeyronProxyEP"
controller, err := NewController(nil, &spec, options.ForceNewSecurityModel{}, options.RuntimePrincipal{newBlessedPrincipal(r)})
@@ -360,7 +361,7 @@
writerCreator := func(int64) lib.ClientWriter {
return &writer
}
- spec := *profiles.LocalListenSpec
+ spec := profiles.LocalListenSpec
spec.Proxy = "/" + proxyEndpoint
controller, err := NewController(writerCreator, &spec, options.NamespaceRoots{"/" + endpoint.String()}, options.ForceNewSecurityModel{}, options.RuntimePrincipal{testPrincipal})
diff --git a/services/wsprd/ipc/server/server.go b/services/wsprd/ipc/server/server.go
index f7f9c4d..5b8fe85 100644
--- a/services/wsprd/ipc/server/server.go
+++ b/services/wsprd/ipc/server/server.go
@@ -297,7 +297,7 @@
}
if s.endpoint == "" {
- endpoint, err := s.server.ListenX(s.listenSpec)
+ endpoint, err := s.server.Listen(*s.listenSpec)
if err != nil {
return "", err
}
diff --git a/services/wsprd/wspr.go b/services/wsprd/wspr.go
index 589748e..b24fd60 100644
--- a/services/wsprd/wspr.go
+++ b/services/wsprd/wspr.go
@@ -27,7 +27,7 @@
opts = append(opts, options.ForceNewSecurityModel{})
}
- proxy := wspr.NewWSPR(*port, *roaming.ListenSpec, *identd, opts...)
+ proxy := wspr.NewWSPR(*port, roaming.ListenSpec, *identd)
defer proxy.Shutdown()
go func() {
proxy.Run()
diff --git a/services/wsprd/wspr/wspr_test.go b/services/wsprd/wspr/wspr_test.go
index ad0ee8b..878e382 100644
--- a/services/wsprd/wspr/wspr_test.go
+++ b/services/wsprd/wspr/wspr_test.go
@@ -46,7 +46,7 @@
// END MOCK BLESSER SERVICE
func setup(t *testing.T) (*WSPR, func()) {
- spec := *profiles.LocalListenSpec
+ spec := profiles.LocalListenSpec
spec.Proxy = "/mock/proxy"
wspr := NewWSPR(0, spec, "/mock/identd", options.ForceNewSecurityModel{})
wspr.blesser = newMockBlesserService(wspr.rt.Principal())
