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)
}
diff --git a/runtimes/google/ipc/server.go b/runtimes/google/ipc/server.go
index d6df99b..5a473d8 100644
--- a/runtimes/google/ipc/server.go
+++ b/runtimes/google/ipc/server.go
@@ -22,7 +22,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/lib/netstate"
@@ -799,8 +799,8 @@
*context.T
server *server // ipc.Server that this flow server belongs to
disp ipc.Dispatcher // ipc.Dispatcher that will serve RPCs on this flow
- dec *vom2.Decoder // to decode requests and args from the client
- enc *vom2.Encoder // to encode responses and results to the client
+ dec *vom.Decoder // to decode requests and args from the client
+ enc *vom.Encoder // to encode responses and results to the client
flow stream.Flow // underlying flow
// Fields filled in during the server invocation.
@@ -830,11 +830,11 @@
discharges: make(map[string]security.Discharge),
}
var err error
- if fs.dec, err = vom2.NewDecoder(flow); err != nil {
+ if fs.dec, err = vom.NewDecoder(flow); err != nil {
flow.Close()
return nil, err
}
- if fs.enc, err = vom2.NewBinaryEncoder(flow); err != nil {
+ if fs.enc, err = vom.NewBinaryEncoder(flow); err != nil {
flow.Close()
return nil, err
}
diff --git a/runtimes/google/ipc/stream/manager/listener.go b/runtimes/google/ipc/stream/manager/listener.go
index b6ed7ad..632a428 100644
--- a/runtimes/google/ipc/stream/manager/listener.go
+++ b/runtimes/google/ipc/stream/manager/listener.go
@@ -17,7 +17,7 @@
"v.io/core/veyron2/naming"
"v.io/core/veyron2/verror"
"v.io/core/veyron2/vlog"
- "v.io/core/veyron2/vom2"
+ "v.io/core/veyron2/vom"
)
var errListenerIsClosed = errors.New("Listener has been Closed")
@@ -188,7 +188,7 @@
}
var request proxy.Request
var response proxy.Response
- enc, err := vom2.NewBinaryEncoder(flow)
+ enc, err := vom.NewBinaryEncoder(flow)
if err != nil {
flow.Close()
vf.StopAccepting()
@@ -199,7 +199,7 @@
vf.StopAccepting()
return nil, nil, fmt.Errorf("failed to encode request to proxy: %v", err)
}
- dec, err := vom2.NewDecoder(flow)
+ dec, err := vom.NewDecoder(flow)
if err != nil {
flow.Close()
vf.StopAccepting()
diff --git a/runtimes/google/ipc/stream/proxy/proxy.go b/runtimes/google/ipc/stream/proxy/proxy.go
index 9ca6b5c..a498b4b 100644
--- a/runtimes/google/ipc/stream/proxy/proxy.go
+++ b/runtimes/google/ipc/stream/proxy/proxy.go
@@ -11,7 +11,7 @@
"v.io/core/veyron2/security"
"v.io/core/veyron2/verror"
"v.io/core/veyron2/vlog"
- "v.io/core/veyron2/vom2"
+ "v.io/core/veyron2/vom"
"v.io/core/veyron/runtimes/google/ipc/stream/crypto"
"v.io/core/veyron/runtimes/google/ipc/stream/id"
@@ -398,7 +398,7 @@
server.Process.InitVCI(server.VC.VCI())
var request Request
var response Response
- dec, err := vom2.NewDecoder(conn)
+ dec, err := vom.NewDecoder(conn)
if err != nil {
response.Error = verror.BadProtocolf("proxy: failed to create Decoder: %v", err)
} else if err := dec.Decode(&request); err != nil {
@@ -415,7 +415,7 @@
response.Endpoint = ep.String()
}
}
- enc, err := vom2.NewBinaryEncoder(conn)
+ enc, err := vom.NewBinaryEncoder(conn)
if err != nil {
proxyLog().Infof("Failed to create Encoder for server %v: %v", server, err)
server.Close(err)
diff --git a/runtimes/google/ipc/stream/vc/auth.go b/runtimes/google/ipc/stream/vc/auth.go
index 7cfbeee..2073d10 100644
--- a/runtimes/google/ipc/stream/vc/auth.go
+++ b/runtimes/google/ipc/stream/vc/auth.go
@@ -12,7 +12,7 @@
"v.io/core/veyron2/context"
"v.io/core/veyron2/ipc/version"
"v.io/core/veyron2/security"
- "v.io/core/veyron2/vom2"
+ "v.io/core/veyron2/vom"
)
var (
@@ -94,7 +94,7 @@
return err
}
var buf bytes.Buffer
- enc, err := vom2.NewBinaryEncoder(&buf)
+ enc, err := vom.NewBinaryEncoder(&buf)
if err != nil {
return err
}
@@ -114,7 +114,7 @@
return err
}
defer msg.Release()
- enc, err = vom2.NewBinaryEncoder(w)
+ enc, err = vom.NewBinaryEncoder(w)
if err != nil {
return err
}
@@ -123,7 +123,7 @@
func readBlessings(r io.Reader, tag []byte, crypter crypto.Crypter, v version.IPCVersion) (blessings security.Blessings, discharges map[string]security.Discharge, err error) {
var msg []byte
- dec, err := vom2.NewDecoder(r)
+ dec, err := vom.NewDecoder(r)
if err != nil {
return nil, nil, fmt.Errorf("failed to create new decoder: %v", err)
}
@@ -135,7 +135,7 @@
return
}
defer buf.Release()
- dec, err = vom2.NewDecoder(bytes.NewReader(buf.Contents))
+ dec, err = vom.NewDecoder(bytes.NewReader(buf.Contents))
if err != nil {
return nil, nil, fmt.Errorf("failed to create new decoder: %v", err)
}
diff --git a/runtimes/google/testing/mocks/ipc/simple_client.go b/runtimes/google/testing/mocks/ipc/simple_client.go
index d90ccd7..e9ce243 100644
--- a/runtimes/google/testing/mocks/ipc/simple_client.go
+++ b/runtimes/google/testing/mocks/ipc/simple_client.go
@@ -10,7 +10,7 @@
"v.io/core/veyron2/security"
"v.io/core/veyron2/vdl/valconv"
"v.io/core/veyron2/vlog"
- "v.io/core/veyron2/vom2"
+ "v.io/core/veyron2/vom"
)
// NewSimpleClient creates a new mocked ipc client where the given map of method name
@@ -56,12 +56,12 @@
// This must be done via vom encode and decode rather than a direct deep copy because (among other reasons)
// reflect-based deep copy on vdl.Type objects will fail because of their private fields. This is not a problem with vom
// as it manually creates the type objects. It is also more realistic to use the same mechanism as the ultimate calls.
- vomBytes, err := vom2.Encode(results)
+ vomBytes, err := vom.Encode(results)
if err != nil {
panic(fmt.Sprintf("Error copying value with vom (failed on encode): %v", err))
}
var copiedResults []interface{}
- if err := vom2.Decode(vomBytes, &copiedResults); err != nil {
+ if err := vom.Decode(vomBytes, &copiedResults); err != nil {
panic(fmt.Sprintf("Error copying value with vom (failed on decode): %v", err))
}
