Remove UnionOfBlessings from WSPR
MultiPart: 2/3
Change-Id: Iacc5fd777a8381f32da9d06b719082cb44c0b631
diff --git a/services/wspr/internal/app/app.go b/services/wspr/internal/app/app.go
index 908db2c..1066ca3 100644
--- a/services/wspr/internal/app/app.go
+++ b/services/wspr/internal/app/app.go
@@ -836,17 +836,6 @@
return p.AddToRoots(inputBlessings)
}
-// UnionOfBlessings returns a Blessings object that carries the union of the provided blessings.
-// TODO(bprosnitz) Rewrite in Javascript
-func (c *Controller) UnionOfBlessings(_ *context.T, _ rpc.ServerCall, inputBlessings []security.Blessings) (principal.BlessingsId, error) {
- outBlessings, err := security.UnionOfBlessings(inputBlessings...)
- if err != nil {
- return 0, err
- }
-
- return c.blessingsCache.Put(outBlessings), nil
-}
-
// HandleGranterResponse handles the result of a Granter request.
func (c *Controller) HandleGranterResponse(id int32, data string) {
c.Lock()
diff --git a/services/wspr/internal/app/controller.vdl b/services/wspr/internal/app/controller.vdl
index 7a28f13..e464467 100644
--- a/services/wspr/internal/app/controller.vdl
+++ b/services/wspr/internal/app/controller.vdl
@@ -51,7 +51,4 @@
RemoteBlessings(name, method string) ([]string | error)
// Signature fetches the signature for a given name.
Signature(name string) ([]signature.Interface | error)
-
- // UnionOfBlessings returns a Blessings object that carries the union of the provided blessings.
- UnionOfBlessings(toJoin []security.WireBlessings) (principal.BlessingsId | error)
}
diff --git a/services/wspr/internal/app/controller.vdl.go b/services/wspr/internal/app/controller.vdl.go
index 34061cf..439110e 100644
--- a/services/wspr/internal/app/controller.vdl.go
+++ b/services/wspr/internal/app/controller.vdl.go
@@ -57,8 +57,6 @@
RemoteBlessings(ctx *context.T, name string, method string, opts ...rpc.CallOpt) ([]string, error)
// Signature fetches the signature for a given name.
Signature(ctx *context.T, name string, opts ...rpc.CallOpt) ([]signature.Interface, error)
- // UnionOfBlessings returns a Blessings object that carries the union of the provided blessings.
- UnionOfBlessings(ctx *context.T, toJoin []security.Blessings, opts ...rpc.CallOpt) (principal.BlessingsId, error)
}
// ControllerClientStub adds universal methods to ControllerClientMethods.
@@ -156,11 +154,6 @@
return
}
-func (c implControllerClientStub) UnionOfBlessings(ctx *context.T, i0 []security.Blessings, opts ...rpc.CallOpt) (o0 principal.BlessingsId, err error) {
- err = v23.GetClient(ctx).Call(ctx, c.name, "UnionOfBlessings", []interface{}{i0}, []interface{}{&o0}, opts...)
- return
-}
-
// ControllerServerMethods is the interface a server writer
// implements for Controller.
type ControllerServerMethods interface {
@@ -199,8 +192,6 @@
RemoteBlessings(ctx *context.T, call rpc.ServerCall, name string, method string) ([]string, error)
// Signature fetches the signature for a given name.
Signature(ctx *context.T, call rpc.ServerCall, name string) ([]signature.Interface, error)
- // UnionOfBlessings returns a Blessings object that carries the union of the provided blessings.
- UnionOfBlessings(ctx *context.T, call rpc.ServerCall, toJoin []security.Blessings) (principal.BlessingsId, error)
}
// ControllerServerStubMethods is the server interface containing
@@ -302,10 +293,6 @@
return s.impl.Signature(ctx, call, i0)
}
-func (s implControllerServerStub) UnionOfBlessings(ctx *context.T, call rpc.ServerCall, i0 []security.Blessings) (principal.BlessingsId, error) {
- return s.impl.UnionOfBlessings(ctx, call, i0)
-}
-
func (s implControllerServerStub) Globber() *rpc.GlobState {
return s.gs
}
@@ -462,15 +449,5 @@
{"", ``}, // []signature.Interface
},
},
- {
- Name: "UnionOfBlessings",
- Doc: "// UnionOfBlessings returns a Blessings object that carries the union of the provided blessings.",
- InArgs: []rpc.ArgDesc{
- {"toJoin", ``}, // []security.Blessings
- },
- OutArgs: []rpc.ArgDesc{
- {"", ``}, // principal.BlessingsId
- },
- },
},
}
