apps: Switch rt.New to veyron2.Init.
This is dependent on https://vanadium-review.googlesource.com/#/c/1637/
Change-Id: I0612041a5039599e3de9865bfc811a31a4f8af56
diff --git a/rps/rpsbot/impl_test.go b/rps/rpsbot/impl_test.go
index d8efbcd..43df78b 100644
--- a/rps/rpsbot/impl_test.go
+++ b/rps/rpsbot/impl_test.go
@@ -21,7 +21,6 @@
"v.io/core/veyron2/ipc"
"v.io/core/veyron2/naming"
"v.io/core/veyron2/options"
- "v.io/core/veyron2/rt"
"v.io/core/veyron2/vlog"
)
@@ -79,13 +78,8 @@
// TestRockPaperScissorsImpl runs one rock-paper-scissors game and verifies
// that all the counters are consistent.
func TestRockPaperScissorsImpl(t *testing.T) {
- r, err := rt.New()
- if err != nil {
- t.Fatalf("Could not initialize runtime: %v", err)
- }
- defer r.Cleanup()
-
- ctx := r.NewContext()
+ ctx, shutdown := veyron2.InitForTest()
+ defer shutdown()
mtAddress, mtStop := startMountTable(t, ctx)
defer mtStop()
diff --git a/rps/rpsbot/main.go b/rps/rpsbot/main.go
index 760791f..98986a8 100644
--- a/rps/rpsbot/main.go
+++ b/rps/rpsbot/main.go
@@ -14,7 +14,6 @@
"v.io/core/veyron2"
"v.io/core/veyron2/context"
- "v.io/core/veyron2/rt"
"v.io/core/veyron2/vlog"
"v.io/core/veyron/lib/signals"
@@ -31,13 +30,8 @@
)
func main() {
- r, err := rt.New()
- if err != nil {
- vlog.Fatalf("Could not initialize runtime %v", err)
- }
- defer r.Cleanup()
-
- ctx := r.NewContext()
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
auth := sflag.NewAuthorizerOrDie()
server, err := veyron2.NewServer(ctx)
diff --git a/rps/rpsplayer/main.go b/rps/rpsplayer/main.go
index 715b7f3..ac0303f 100644
--- a/rps/rpsplayer/main.go
+++ b/rps/rpsplayer/main.go
@@ -14,8 +14,8 @@
"v.io/core/veyron2"
"v.io/core/veyron2/context"
"v.io/core/veyron2/ipc"
- "v.io/core/veyron2/rt"
"v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vtrace"
"v.io/core/veyron/profiles/roaming"
sflag "v.io/core/veyron/security/flag"
@@ -29,14 +29,11 @@
)
func main() {
- r, err := rt.New()
- if err != nil {
- vlog.Fatalf("Could not initialize runtime %v", err)
- }
- defer r.Cleanup()
+ rootctx, shutdown := veyron2.Init()
+ defer shutdown()
for {
- ctx := r.NewContext()
+ ctx, _ := vtrace.SetNewTrace(rootctx)
if selectOne([]string{"Initiate Game", "Wait For Challenge"}) == 0 {
initiateGame(ctx)
} else {
diff --git a/rps/rpsscorekeeper/main.go b/rps/rpsscorekeeper/main.go
index e5f0047..ff019c3 100644
--- a/rps/rpsscorekeeper/main.go
+++ b/rps/rpsscorekeeper/main.go
@@ -10,7 +10,6 @@
"v.io/core/veyron2"
"v.io/core/veyron2/ipc"
- "v.io/core/veyron2/rt"
"v.io/core/veyron2/vlog"
"v.io/core/veyron/profiles/roaming"
@@ -31,13 +30,8 @@
}
func main() {
- r, err := rt.New()
- if err != nil {
- vlog.Fatalf("Could not initialize runtime %v", err)
- }
- defer r.Cleanup()
-
- ctx := r.NewContext()
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
server, err := veyron2.NewServer(ctx)
if err != nil {
diff --git a/tunnel/tunneld/main.go b/tunnel/tunneld/main.go
index d308b35..bc7f0ac 100644
--- a/tunnel/tunneld/main.go
+++ b/tunnel/tunneld/main.go
@@ -9,7 +9,6 @@
"strings"
"v.io/core/veyron2"
- "v.io/core/veyron2/rt"
"v.io/core/veyron2/vlog"
"v.io/core/veyron/lib/signals"
@@ -40,13 +39,8 @@
}
func main() {
- r, err := rt.New()
- if err != nil {
- vlog.Fatalf("Could not initialize runtime %v", err)
- }
- defer r.Cleanup()
-
- ctx := r.NewContext()
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
auth := sflag.NewAuthorizerOrDie()
server, err := veyron2.NewServer(ctx)
diff --git a/tunnel/vsh/main.go b/tunnel/vsh/main.go
index 1d854cb..04a71a2 100644
--- a/tunnel/vsh/main.go
+++ b/tunnel/vsh/main.go
@@ -11,8 +11,8 @@
"path"
"strings"
+ "v.io/core/veyron2"
"v.io/core/veyron2/context"
- "v.io/core/veyron2/rt"
"v.io/core/veyron2/vlog"
_ "v.io/core/veyron/profiles"
@@ -73,13 +73,8 @@
}
func realMain() int {
- r, err := rt.New()
- if err != nil {
- vlog.Fatalf("Could not initialize runtime %v", err)
- }
- defer r.Cleanup()
-
- ctx := r.NewContext()
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
oname, cmd, err := objectNameAndCommandLine()
if err != nil {
