core: Replace vdlutil.Register with vdl.Register.
The vdlutil.Register function was only meant for the transition
from vom1 to vom2; now that the transition is over, we can just
call vdl.Register instead.
Also note that types defined in vdl files are automatically
registered in a package init function, so some calls can be
removed completely.
Change-Id: I7812a47427cee02d232c668ed7cb24f9d1981573
MultiPart: 1/2
diff --git a/runtimes/google/ipc/full_test.go b/runtimes/google/ipc/full_test.go
index e8d702d..2612001 100644
--- a/runtimes/google/ipc/full_test.go
+++ b/runtimes/google/ipc/full_test.go
@@ -23,6 +23,7 @@
"v.io/core/veyron2/security"
"v.io/core/veyron2/services/security/access"
"v.io/core/veyron2/uniqueid"
+ "v.io/core/veyron2/vdl"
"v.io/core/veyron2/vdl/vdlutil"
verror "v.io/core/veyron2/verror2"
"v.io/core/veyron2/vlog"
@@ -1695,5 +1696,5 @@
func init() {
testutil.Init()
- vdlutil.Register(fakeTimeCaveat(0))
+ vdl.Register(fakeTimeCaveat(0))
}
diff --git a/security/util_test.go b/security/util_test.go
index e285949..e39e356 100644
--- a/security/util_test.go
+++ b/security/util_test.go
@@ -9,7 +9,7 @@
"testing"
"v.io/core/veyron2/security"
- "v.io/core/veyron2/vdl/vdlutil"
+ "v.io/core/veyron2/vdl"
)
func TestLoadSavePEMKey(t *testing.T) {
@@ -121,6 +121,6 @@
}
func init() {
- vdlutil.Register(&fpCaveat{})
- vdlutil.Register(&tpCaveat{})
+ vdl.Register(&fpCaveat{})
+ vdl.Register(&tpCaveat{})
}
diff --git a/services/identity/revocation/revocation_manager.go b/services/identity/revocation/revocation_manager.go
index a68ef2a..235b88f 100644
--- a/services/identity/revocation/revocation_manager.go
+++ b/services/identity/revocation/revocation_manager.go
@@ -9,7 +9,7 @@
"time"
"v.io/core/veyron2/security"
- "v.io/core/veyron2/vdl/vdlutil"
+ "v.io/core/veyron2/vdl"
)
// RevocationManager persists information for revocation caveats to provided discharges and allow for future revocations.
@@ -96,5 +96,5 @@
}
func init() {
- vdlutil.Register(revocationCaveat{})
+ vdl.Register(revocationCaveat{})
}
diff --git a/services/mgmt/application/impl/acl_test.go b/services/mgmt/application/impl/acl_test.go
index 40d432b..90933ce 100644
--- a/services/mgmt/application/impl/acl_test.go
+++ b/services/mgmt/application/impl/acl_test.go
@@ -16,7 +16,6 @@
"v.io/core/veyron2/security"
"v.io/core/veyron2/services/mgmt/application"
"v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/vdl/vdlutil"
"v.io/core/veyron2/verror"
"v.io/core/veyron2/vlog"
@@ -37,9 +36,6 @@
var globalCancel context.CancelFunc
func init() {
- // TODO(rjkroege): Remove when vom is ready.
- vdlutil.Register(&naming.VDLMountedServer{})
-
modules.RegisterChild(repoCmd, "", appRepository)
testutil.Init()
diff --git a/services/mgmt/binary/impl/acl_test.go b/services/mgmt/binary/impl/acl_test.go
index 6778da3..14006c7 100644
--- a/services/mgmt/binary/impl/acl_test.go
+++ b/services/mgmt/binary/impl/acl_test.go
@@ -14,7 +14,6 @@
"v.io/core/veyron2/security"
"v.io/core/veyron2/services/mgmt/repository"
"v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/vdl/vdlutil"
"v.io/core/veyron2/verror"
"v.io/core/veyron2/vlog"
@@ -32,9 +31,6 @@
)
func init() {
- // TODO(rjkroege): Remove when vom2 is ready.
- vdlutil.Register(&naming.VDLMountedServer{})
-
modules.RegisterChild(binaryCmd, "", binaryd)
testutil.Init()
diff --git a/services/mgmt/device/impl/impl_test.go b/services/mgmt/device/impl/impl_test.go
index 54760db..5037905 100644
--- a/services/mgmt/device/impl/impl_test.go
+++ b/services/mgmt/device/impl/impl_test.go
@@ -40,7 +40,6 @@
"v.io/core/veyron2/services/mgmt/pprof"
"v.io/core/veyron2/services/mgmt/stats"
"v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/vdl/vdlutil"
verror "v.io/core/veyron2/verror2"
"v.io/core/veyron2/vlog"
@@ -77,9 +76,6 @@
// need to ensure it's defined.
flag.String("name", "", "")
- // TODO(rthellend): Remove when vom is ready.
- vdlutil.Register(&naming.VDLMountedServer{})
-
modules.RegisterChild(execScriptCmd, "", execScript)
modules.RegisterChild(deviceManagerCmd, "", deviceManager)
modules.RegisterChild(appCmd, "", app)
diff --git a/tools/debug/impl.go b/tools/debug/impl.go
index e85ad2a..0165eb8 100644
--- a/tools/debug/impl.go
+++ b/tools/debug/impl.go
@@ -26,7 +26,6 @@
"v.io/core/veyron2/services/watch"
watchtypes "v.io/core/veyron2/services/watch/types"
"v.io/core/veyron2/uniqueid"
- "v.io/core/veyron2/vdl/vdlutil"
"v.io/core/veyron2/vtrace"
"v.io/lib/cmdline"
)
@@ -42,8 +41,6 @@
)
func init() {
- vdlutil.Register(istats.HistogramValue{})
-
// logs read flags
cmdLogsRead.Flags.BoolVar(&follow, "f", false, "When true, read will wait for new log entries when it reaches the end of the file.")
cmdLogsRead.Flags.BoolVar(&verbose, "v", false, "When true, read will be more verbose.")
