core: Rename vom2 to vom.
Change-Id: I826c781cb60939d49cc13cca4a4d7a99d3c74730
MultiPart: 1/5
diff --git a/runtimes/google/ipc/client.go b/runtimes/google/ipc/client.go
index 2199a8d..7c59e5d 100644
--- a/runtimes/google/ipc/client.go
+++ b/runtimes/google/ipc/client.go
@@ -21,7 +21,7 @@
old_verror "v.io/core/veyron2/verror"
verror "v.io/core/veyron2/verror2"
"v.io/core/veyron2/vlog"
- "v.io/core/veyron2/vom2"
+ "v.io/core/veyron2/vom"
"v.io/core/veyron2/vtrace"
"v.io/core/veyron/runtimes/google/ipc/stream/vc"
@@ -673,12 +673,12 @@
// flowClient implements the RPC client-side protocol for a single RPC, over a
// flow that's already connected to the server.
type flowClient struct {
- ctx *context.T // context to annotate with call details
- dec *vom2.Decoder // to decode responses and results from the server
- enc *vom2.Encoder // to encode requests and args to the server
- server []string // Blessings bound to the server that authorize it to receive the IPC request from the client.
- flow stream.Flow // the underlying flow
- response ipc.Response // each decoded response message is kept here
+ ctx *context.T // context to annotate with call details
+ dec *vom.Decoder // to decode responses and results from the server
+ enc *vom.Encoder // to encode requests and args to the server
+ server []string // Blessings bound to the server that authorize it to receive the IPC request from the client.
+ flow stream.Flow // the underlying flow
+ response ipc.Response // each decoded response message is kept here
discharges []security.Discharge // discharges used for this request
dc vc.DischargeClient // client-global discharge-client
@@ -701,11 +701,11 @@
dc: dc,
}
var err error
- if fc.enc, err = vom2.NewBinaryEncoder(flow); err != nil {
+ if fc.enc, err = vom.NewBinaryEncoder(flow); err != nil {
berr := verror.Make(verror.BadProtocol, fc.ctx, verror.Make(errVomEncoder, fc.ctx, err))
return nil, fc.close(berr)
}
- if fc.dec, err = vom2.NewDecoder(flow); err != nil {
+ if fc.dec, err = vom.NewDecoder(flow); err != nil {
berr := verror.Make(verror.BadProtocol, fc.ctx, verror.Make(errVomDecoder, fc.ctx, err))
return nil, fc.close(berr)
}
