veyron/tools/principal: More vom to vom2.
Change-Id: Ic4534c99010b872893f74b2f7a2ce5a68183d4b5
diff --git a/tools/principal/main.go b/tools/principal/main.go
index 14fb1b3..93b9ba4 100644
--- a/tools/principal/main.go
+++ b/tools/principal/main.go
@@ -20,7 +20,7 @@
"v.io/core/veyron2/naming"
"v.io/core/veyron2/rt"
"v.io/core/veyron2/security"
- "v.io/core/veyron2/vom"
+ "v.io/core/veyron2/vom2"
"v.io/lib/cmdline"
)
@@ -843,7 +843,11 @@
func base64VomEncode(i interface{}) (string, error) {
buf := &bytes.Buffer{}
closer := base64.NewEncoder(base64.URLEncoding, buf)
- if err := vom.NewEncoder(closer).Encode(i); err != nil {
+ enc, err := vom2.NewBinaryEncoder(closer)
+ if err != nil {
+ return "", err
+ }
+ if err := enc.Encode(i); err != nil {
return "", err
}
// Must close the base64 encoder to flush out any partially written
@@ -859,7 +863,11 @@
if err != nil {
return err
}
- return vom.NewDecoder(bytes.NewBuffer(b)).Decode(i)
+ dec, err := vom2.NewDecoder(bytes.NewBuffer(b))
+ if err != nil {
+ return err
+ }
+ return dec.Decode(i)
}
type recvBlessingsService struct {
