Merge "core,vdl: Remove use of RuntimeFromContext from vdl generator."
diff --git a/runtimes/google/ipc/benchmark/service.vdl.go b/runtimes/google/ipc/benchmark/service.vdl.go
index a2485f8..cea2802 100644
--- a/runtimes/google/ipc/benchmark/service.vdl.go
+++ b/runtimes/google/ipc/benchmark/service.vdl.go
@@ -57,7 +57,7 @@
if c.client != nil {
return c.client
}
- return __veyron2.RuntimeFromContext(ctx).Client()
+ return __veyron2.GetClient(ctx)
}
func (c implBenchmarkClientStub) Echo(ctx *__context.T, i0 []byte, opts ...__ipc.CallOpt) (o0 []byte, err error) {
diff --git a/security/agent/pingpong/wire.vdl.go b/security/agent/pingpong/wire.vdl.go
index e3ca4f7..4344728 100644
--- a/security/agent/pingpong/wire.vdl.go
+++ b/security/agent/pingpong/wire.vdl.go
@@ -51,7 +51,7 @@
if c.client != nil {
return c.client
}
- return __veyron2.RuntimeFromContext(ctx).Client()
+ return __veyron2.GetClient(ctx)
}
func (c implPingPongClientStub) Ping(ctx *__context.T, i0 string, opts ...__ipc.CallOpt) (o0 string, err error) {
diff --git a/security/agent/server/wire.vdl.go b/security/agent/server/wire.vdl.go
index a40d840..529a32d 100644
--- a/security/agent/server/wire.vdl.go
+++ b/security/agent/server/wire.vdl.go
@@ -67,7 +67,7 @@
if c.client != nil {
return c.client
}
- return __veyron2.RuntimeFromContext(ctx).Client()
+ return __veyron2.GetClient(ctx)
}
func (c implAgentClientStub) Bless(ctx *__context.T, i0 []byte, i1 security.WireBlessings, i2 string, i3 security.Caveat, i4 []security.Caveat, opts ...__ipc.CallOpt) (o0 security.WireBlessings, err error) {
diff --git a/services/identity/identity.vdl.go b/services/identity/identity.vdl.go
index c7b6dd2..c369461 100644
--- a/services/identity/identity.vdl.go
+++ b/services/identity/identity.vdl.go
@@ -68,7 +68,7 @@
if c.client != nil {
return c.client
}
- return __veyron2.RuntimeFromContext(ctx).Client()
+ return __veyron2.GetClient(ctx)
}
func (c implOAuthBlesserClientStub) BlessUsingAccessToken(ctx *__context.T, i0 string, opts ...__ipc.CallOpt) (o0 security.WireBlessings, o1 string, err error) {
@@ -270,7 +270,7 @@
if c.client != nil {
return c.client
}
- return __veyron2.RuntimeFromContext(ctx).Client()
+ return __veyron2.GetClient(ctx)
}
func (c implMacaroonBlesserClientStub) Bless(ctx *__context.T, i0 string, opts ...__ipc.CallOpt) (o0 security.WireBlessings, err error) {
diff --git a/services/mgmt/device/config.vdl.go b/services/mgmt/device/config.vdl.go
index b8eb6fd..4e35ccc 100644
--- a/services/mgmt/device/config.vdl.go
+++ b/services/mgmt/device/config.vdl.go
@@ -52,7 +52,7 @@
if c.client != nil {
return c.client
}
- return __veyron2.RuntimeFromContext(ctx).Client()
+ return __veyron2.GetClient(ctx)
}
func (c implConfigClientStub) Set(ctx *__context.T, i0 string, i1 string, opts ...__ipc.CallOpt) (err error) {
diff --git a/services/mgmt/repository/repository.vdl.go b/services/mgmt/repository/repository.vdl.go
index 2f10e48..b96abee 100644
--- a/services/mgmt/repository/repository.vdl.go
+++ b/services/mgmt/repository/repository.vdl.go
@@ -87,7 +87,7 @@
if c.client != nil {
return c.client
}
- return __veyron2.RuntimeFromContext(ctx).Client()
+ return __veyron2.GetClient(ctx)
}
func (c implApplicationClientStub) Put(ctx *__context.T, i0 []string, i1 application.Envelope, opts ...__ipc.CallOpt) (err error) {
@@ -389,7 +389,7 @@
if c.client != nil {
return c.client
}
- return __veyron2.RuntimeFromContext(ctx).Client()
+ return __veyron2.GetClient(ctx)
}
func (c implProfileClientStub) Specification(ctx *__context.T, opts ...__ipc.CallOpt) (o0 profile.Specification, err error) {
diff --git a/services/mounttable/lib/collection_test_interface.vdl.go b/services/mounttable/lib/collection_test_interface.vdl.go
index 8fc2ae9..621160f 100644
--- a/services/mounttable/lib/collection_test_interface.vdl.go
+++ b/services/mounttable/lib/collection_test_interface.vdl.go
@@ -56,7 +56,7 @@
if c.client != nil {
return c.client
}
- return __veyron2.RuntimeFromContext(ctx).Client()
+ return __veyron2.GetClient(ctx)
}
func (c implCollectionClientStub) Export(ctx *__context.T, i0 string, i1 bool, opts ...__ipc.CallOpt) (err error) {
diff --git a/services/security/discharger.vdl.go b/services/security/discharger.vdl.go
index 55ff551..c98b9b6 100644
--- a/services/security/discharger.vdl.go
+++ b/services/security/discharger.vdl.go
@@ -61,7 +61,7 @@
if c.client != nil {
return c.client
}
- return __veyron2.RuntimeFromContext(ctx).Client()
+ return __veyron2.GetClient(ctx)
}
func (c implDischargerClientStub) Discharge(ctx *__context.T, i0 __vdlutil.Any, i1 security.DischargeImpetus, opts ...__ipc.CallOpt) (o0 __vdlutil.Any, err error) {
diff --git a/tools/vrpc/test_base/test_base.vdl.go b/tools/vrpc/test_base/test_base.vdl.go
index 956570d..87a4708 100644
--- a/tools/vrpc/test_base/test_base.vdl.go
+++ b/tools/vrpc/test_base/test_base.vdl.go
@@ -88,7 +88,7 @@
if c.client != nil {
return c.client
}
- return __veyron2.RuntimeFromContext(ctx).Client()
+ return __veyron2.GetClient(ctx)
}
func (c implTypeTesterClientStub) EchoBool(ctx *__context.T, i0 bool, opts ...__ipc.CallOpt) (o0 bool, err error) {
