pipe2browser: Rename things called *Context to *Call.
This is part of an effort to clarify naming around contexts. We are
going to rename ServerContext and security.Context to ServerCall and
security.Call respectively. Now when people say "context" we will
know they mean context.T.
In a follow-up change I can try to change the variable names ctx and
context to call. I also need to merge the security.Call interface into
ClientCall and remove redundant access to LocalPrincipal.
MultiPart: 8/11
Change-Id: I876b85ba6f5434baaaaffa89ac554ae8464072da
diff --git a/go/src/p2b/vdl/p2b.vdl.go b/go/src/p2b/vdl/p2b.vdl.go
index 5e83931..d6ec0c5 100644
--- a/go/src/p2b/vdl/p2b.vdl.go
+++ b/go/src/p2b/vdl/p2b.vdl.go
@@ -24,7 +24,7 @@
// Pipe creates a bidirectional pipe between client and viewer
// service, returns total number of bytes received by the service
// after streaming ends
- Pipe(*context.T, ...ipc.CallOpt) (ViewerPipeCall, error)
+ Pipe(*context.T, ...ipc.CallOpt) (ViewerPipeClientCall, error)
}
// ViewerClientStub adds universal methods to ViewerClientMethods.
@@ -56,12 +56,12 @@
return v23.GetClient(ctx)
}
-func (c implViewerClientStub) Pipe(ctx *context.T, opts ...ipc.CallOpt) (ocall ViewerPipeCall, err error) {
- var call ipc.Call
+func (c implViewerClientStub) Pipe(ctx *context.T, opts ...ipc.CallOpt) (ocall ViewerPipeClientCall, err error) {
+ var call ipc.ClientCall
if call, err = c.c(ctx).StartCall(ctx, c.name, "Pipe", nil, opts...); err != nil {
return
}
- ocall = &implViewerPipeCall{Call: call}
+ ocall = &implViewerPipeClientCall{ClientCall: call}
return
}
@@ -86,8 +86,8 @@
}
}
-// ViewerPipeCall represents the call returned from Viewer.Pipe.
-type ViewerPipeCall interface {
+// ViewerPipeClientCall represents the call returned from Viewer.Pipe.
+type ViewerPipeClientCall interface {
ViewerPipeClientStream
// Finish performs the equivalent of SendStream().Close, then blocks until
// the server is done, and returns the positional return values for the call.
@@ -102,11 +102,11 @@
Finish() (*vdl.Value, error)
}
-type implViewerPipeCall struct {
- ipc.Call
+type implViewerPipeClientCall struct {
+ ipc.ClientCall
}
-func (c *implViewerPipeCall) SendStream() interface {
+func (c *implViewerPipeClientCall) SendStream() interface {
Send(item []byte) error
Close() error
} {
@@ -114,7 +114,7 @@
}
type implViewerPipeCallSend struct {
- c *implViewerPipeCall
+ c *implViewerPipeClientCall
}
func (c implViewerPipeCallSend) Send(item []byte) error {
@@ -123,8 +123,8 @@
func (c implViewerPipeCallSend) Close() error {
return c.c.CloseSend()
}
-func (c *implViewerPipeCall) Finish() (o0 *vdl.Value, err error) {
- err = c.Call.Finish(&o0)
+func (c *implViewerPipeClientCall) Finish() (o0 *vdl.Value, err error) {
+ err = c.ClientCall.Finish(&o0)
return
}
@@ -229,21 +229,21 @@
// ViewerPipeContext represents the context passed to Viewer.Pipe.
type ViewerPipeContext interface {
- ipc.ServerContext
+ ipc.ServerCall
ViewerPipeServerStream
}
-// ViewerPipeContextStub is a wrapper that converts ipc.ServerCall into
+// ViewerPipeContextStub is a wrapper that converts ipc.StreamServerCall into
// a typesafe stub that implements ViewerPipeContext.
type ViewerPipeContextStub struct {
- ipc.ServerCall
+ ipc.StreamServerCall
valRecv []byte
errRecv error
}
-// Init initializes ViewerPipeContextStub from ipc.ServerCall.
-func (s *ViewerPipeContextStub) Init(call ipc.ServerCall) {
- s.ServerCall = call
+// Init initializes ViewerPipeContextStub from ipc.StreamServerCall.
+func (s *ViewerPipeContextStub) Init(call ipc.StreamServerCall) {
+ s.StreamServerCall = call
}
// RecvStream returns the receiver side of the Viewer.Pipe server stream.
