wspr: rm name from context
MultiPart: 2/4
Change-Id: I96c5f22b4f4f0415239e152442e303414cff2d10
diff --git a/services/wsprd/app/mock_jsServer_test.go b/services/wsprd/app/mock_jsServer_test.go
index 6e8a037..74dfcf6 100644
--- a/services/wsprd/app/mock_jsServer_test.go
+++ b/services/wsprd/app/mock_jsServer_test.go
@@ -145,19 +145,11 @@
if field, got, want := "Method", context.Method, lib.LowercaseFirstCharacter(m.method); got != want {
m.controller.HandleAuthResponse(m.flowCount, internalErrJSON(fmt.Sprintf("unexpected value for %s: got %v, want %v", field, got, want)))
return nil
-
- }
-
- if field, got, want := "Name", context.Name, "adder"; got != want {
- m.controller.HandleAuthResponse(m.flowCount, internalErrJSON(fmt.Sprintf("unexpected value for %s: got %v, want %v", field, got, want)))
- return nil
-
}
if field, got, want := "Suffix", context.Suffix, "adder"; got != want {
m.controller.HandleAuthResponse(m.flowCount, internalErrJSON(fmt.Sprintf("unexpected value for %s: got %v, want %v", field, got, want)))
return nil
-
}
// We expect localBlessings and remoteBlessings to be set and the publicKey be a string
@@ -174,13 +166,11 @@
if !validateEndpoint(context.LocalEndpoint) {
m.controller.HandleAuthResponse(m.flowCount, internalErrJSON(fmt.Sprintf("bad endpoint:%v", context.LocalEndpoint)))
return nil
-
}
if !validateEndpoint(context.RemoteEndpoint) {
m.controller.HandleAuthResponse(m.flowCount, internalErrJSON(fmt.Sprintf("bad endpoint:%v", context.RemoteEndpoint)))
return nil
-
}
bytes, err := json.Marshal(map[string]interface{}{
@@ -209,37 +199,27 @@
if err := lib.VomDecode(v.(string), &msg); err != nil {
m.controller.HandleServerResponse(m.flowCount, internalErrJSON(err))
return nil
-
}
if field, got, want := "Method", msg.Method, lib.LowercaseFirstCharacter(m.method); got != want {
m.controller.HandleServerResponse(m.flowCount, internalErrJSON(fmt.Sprintf("unexpected value for %s: got %v, want %v", field, got, want)))
return nil
-
}
if field, got, want := "Handle", msg.Handle, int32(0); got != want {
m.controller.HandleServerResponse(m.flowCount, internalErrJSON(fmt.Sprintf("unexpected value for %s: got %v, want %v", field, got, want)))
return nil
-
}
if field, got, want := "Args", msg.Args, m.inArgs; !reflect.DeepEqual(got, want) {
m.controller.HandleServerResponse(m.flowCount, internalErrJSON(fmt.Sprintf("unexpected value for %s: got %v, want %v", field, got, want)))
return nil
-
}
context := msg.Context.SecurityContext
- if field, got, want := "Name", context.Name, "adder"; got != want {
- m.controller.HandleServerResponse(m.flowCount, internalErrJSON(fmt.Sprintf("unexpected value for %s: got %v, want %v", field, got, want)))
- return nil
- }
-
if field, got, want := "Suffix", context.Suffix, "adder"; got != want {
m.controller.HandleServerResponse(m.flowCount, internalErrJSON(fmt.Sprintf("unexpected value for %s: got %v, want %v", field, got, want)))
return nil
-
}
if !validateBlessing(context.RemoteBlessings) {
diff --git a/services/wsprd/ipc/server/server.go b/services/wsprd/ipc/server/server.go
index b478647..321c624 100644
--- a/services/wsprd/ipc/server/server.go
+++ b/services/wsprd/ipc/server/server.go
@@ -65,7 +65,6 @@
// This is exported to make the app test easier.
type SecurityContext struct {
Method string
- Name string
Suffix string
MethodTags []interface{}
LocalBlessings principal.BlessingsHandle
@@ -316,7 +315,6 @@
func (s *Server) convertSecurityContext(ctx security.Context) SecurityContext {
return SecurityContext{
Method: lib.LowercaseFirstCharacter(ctx.Method()),
- Name: ctx.Name(),
Suffix: ctx.Suffix(),
MethodTags: ctx.MethodTags(),
LocalEndpoint: ctx.LocalEndpoint().String(),
