veyron2/vdl: Refactor go imports logic.
[NOTE: Real changes are under veyron2/vdl/..., everything else is
mostly just vdl updates]
This CL refactors the logic for go imports in the vdl tool. It
is a pre-requisite for the upcoming native type support, which is
necessary for the standard "time" package.
All dependency tracking should be performed in the codegen
modules, rather than in the vdl compiler. The reasoning is
because dependency requirements are different for each codegen
language, and it's hard to come up with general-purpose rules.
In this CL we only implement the new dependency tracking /
imports mechanism for go. Eventually all codegen languages will
implement their own mechanism, and we'll be able to remove the
common imports logic.
As a side-effect, we get nicer generated code; rather than having
special local package names like "__ipc", we just use the default
in most cases. If there is a collision, we simply pick a
non-conflicting name.
MultiPart: 1/6
Change-Id: I715bf9170fa2bedd00eccc340feccdb460cd519c
diff --git a/runtimes/google/ipc/benchmark/service.vdl.go b/runtimes/google/ipc/benchmark/service.vdl.go
index a2a64ff..76759b4 100644
--- a/runtimes/google/ipc/benchmark/service.vdl.go
+++ b/runtimes/google/ipc/benchmark/service.vdl.go
@@ -6,36 +6,37 @@
package benchmark
import (
- "v.io/core/veyron2/services/security/access"
+ // VDL system imports
+ "io"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/vdl"
- // The non-user imports are prefixed with "__" to prevent collisions.
- __io "io"
- __veyron2 "v.io/core/veyron2"
- __context "v.io/core/veyron2/context"
- __ipc "v.io/core/veyron2/ipc"
- __vdl "v.io/core/veyron2/vdl"
+ // VDL user imports
+ "v.io/core/veyron2/services/security/access"
)
// BenchmarkClientMethods is the client interface
// containing Benchmark methods.
type BenchmarkClientMethods interface {
// Echo returns the payload that it receives.
- Echo(ctx *__context.T, Payload []byte, opts ...__ipc.CallOpt) ([]byte, error)
+ Echo(ctx *context.T, Payload []byte, opts ...ipc.CallOpt) ([]byte, error)
// EchoStream returns the payload that it receives via the stream.
- EchoStream(*__context.T, ...__ipc.CallOpt) (BenchmarkEchoStreamCall, error)
+ EchoStream(*context.T, ...ipc.CallOpt) (BenchmarkEchoStreamCall, error)
}
// BenchmarkClientStub adds universal methods to BenchmarkClientMethods.
type BenchmarkClientStub interface {
BenchmarkClientMethods
- __ipc.UniversalServiceMethods
+ ipc.UniversalServiceMethods
}
// BenchmarkClient returns a client stub for Benchmark.
-func BenchmarkClient(name string, opts ...__ipc.BindOpt) BenchmarkClientStub {
- var client __ipc.Client
+func BenchmarkClient(name string, opts ...ipc.BindOpt) BenchmarkClientStub {
+ var client ipc.Client
for _, opt := range opts {
- if clientOpt, ok := opt.(__ipc.Client); ok {
+ if clientOpt, ok := opt.(ipc.Client); ok {
client = clientOpt
}
}
@@ -44,18 +45,18 @@
type implBenchmarkClientStub struct {
name string
- client __ipc.Client
+ client ipc.Client
}
-func (c implBenchmarkClientStub) c(ctx *__context.T) __ipc.Client {
+func (c implBenchmarkClientStub) c(ctx *context.T) ipc.Client {
if c.client != nil {
return c.client
}
- return __veyron2.GetClient(ctx)
+ return veyron2.GetClient(ctx)
}
-func (c implBenchmarkClientStub) Echo(ctx *__context.T, i0 []byte, opts ...__ipc.CallOpt) (o0 []byte, err error) {
- var call __ipc.Call
+func (c implBenchmarkClientStub) Echo(ctx *context.T, i0 []byte, opts ...ipc.CallOpt) (o0 []byte, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Echo", []interface{}{i0}, opts...); err != nil {
return
}
@@ -65,8 +66,8 @@
return
}
-func (c implBenchmarkClientStub) EchoStream(ctx *__context.T, opts ...__ipc.CallOpt) (ocall BenchmarkEchoStreamCall, err error) {
- var call __ipc.Call
+func (c implBenchmarkClientStub) EchoStream(ctx *context.T, opts ...ipc.CallOpt) (ocall BenchmarkEchoStreamCall, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "EchoStream", nil, opts...); err != nil {
return
}
@@ -124,7 +125,7 @@
}
type implBenchmarkEchoStreamCall struct {
- __ipc.Call
+ ipc.Call
valRecv []byte
errRecv error
}
@@ -149,7 +150,7 @@
return c.c.valRecv
}
func (c implBenchmarkEchoStreamCallRecv) Err() error {
- if c.c.errRecv == __io.EOF {
+ if c.c.errRecv == io.EOF {
return nil
}
return c.c.errRecv
@@ -182,7 +183,7 @@
// implements for Benchmark.
type BenchmarkServerMethods interface {
// Echo returns the payload that it receives.
- Echo(ctx __ipc.ServerContext, Payload []byte) ([]byte, error)
+ Echo(ctx ipc.ServerContext, Payload []byte) ([]byte, error)
// EchoStream returns the payload that it receives via the stream.
EchoStream(BenchmarkEchoStreamContext) error
}
@@ -193,7 +194,7 @@
// is the streaming methods.
type BenchmarkServerStubMethods interface {
// Echo returns the payload that it receives.
- Echo(ctx __ipc.ServerContext, Payload []byte) ([]byte, error)
+ Echo(ctx ipc.ServerContext, Payload []byte) ([]byte, error)
// EchoStream returns the payload that it receives via the stream.
EchoStream(*BenchmarkEchoStreamContextStub) error
}
@@ -202,7 +203,7 @@
type BenchmarkServerStub interface {
BenchmarkServerStubMethods
// Describe the Benchmark interfaces.
- Describe__() []__ipc.InterfaceDesc
+ Describe__() []ipc.InterfaceDesc
}
// BenchmarkServer returns a server stub for Benchmark.
@@ -214,9 +215,9 @@
}
// Initialize GlobState; always check the stub itself first, to handle the
// case where the user has the Glob method defined in their VDL source.
- if gs := __ipc.NewGlobState(stub); gs != nil {
+ if gs := ipc.NewGlobState(stub); gs != nil {
stub.gs = gs
- } else if gs := __ipc.NewGlobState(impl); gs != nil {
+ } else if gs := ipc.NewGlobState(impl); gs != nil {
stub.gs = gs
}
return stub
@@ -224,10 +225,10 @@
type implBenchmarkServerStub struct {
impl BenchmarkServerMethods
- gs *__ipc.GlobState
+ gs *ipc.GlobState
}
-func (s implBenchmarkServerStub) Echo(ctx __ipc.ServerContext, i0 []byte) ([]byte, error) {
+func (s implBenchmarkServerStub) Echo(ctx ipc.ServerContext, i0 []byte) ([]byte, error) {
return s.impl.Echo(ctx, i0)
}
@@ -235,41 +236,41 @@
return s.impl.EchoStream(ctx)
}
-func (s implBenchmarkServerStub) Globber() *__ipc.GlobState {
+func (s implBenchmarkServerStub) Globber() *ipc.GlobState {
return s.gs
}
-func (s implBenchmarkServerStub) Describe__() []__ipc.InterfaceDesc {
- return []__ipc.InterfaceDesc{BenchmarkDesc}
+func (s implBenchmarkServerStub) Describe__() []ipc.InterfaceDesc {
+ return []ipc.InterfaceDesc{BenchmarkDesc}
}
// BenchmarkDesc describes the Benchmark interface.
-var BenchmarkDesc __ipc.InterfaceDesc = descBenchmark
+var BenchmarkDesc ipc.InterfaceDesc = descBenchmark
// descBenchmark hides the desc to keep godoc clean.
-var descBenchmark = __ipc.InterfaceDesc{
+var descBenchmark = ipc.InterfaceDesc{
Name: "Benchmark",
PkgPath: "v.io/core/veyron/runtimes/google/ipc/benchmark",
- Methods: []__ipc.MethodDesc{
+ Methods: []ipc.MethodDesc{
{
Name: "Echo",
Doc: "// Echo returns the payload that it receives.",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"Payload", ``}, // []byte
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // []byte
{"", ``}, // error
},
- Tags: []__vdl.AnyRep{access.Tag("Read")},
+ Tags: []vdl.AnyRep{access.Tag("Read")},
},
{
Name: "EchoStream",
Doc: "// EchoStream returns the payload that it receives via the stream.",
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
- Tags: []__vdl.AnyRep{access.Tag("Read")},
+ Tags: []vdl.AnyRep{access.Tag("Read")},
},
},
}
@@ -299,20 +300,20 @@
// BenchmarkEchoStreamContext represents the context passed to Benchmark.EchoStream.
type BenchmarkEchoStreamContext interface {
- __ipc.ServerContext
+ ipc.ServerContext
BenchmarkEchoStreamServerStream
}
// BenchmarkEchoStreamContextStub is a wrapper that converts ipc.ServerCall into
// a typesafe stub that implements BenchmarkEchoStreamContext.
type BenchmarkEchoStreamContextStub struct {
- __ipc.ServerCall
+ ipc.ServerCall
valRecv []byte
errRecv error
}
// Init initializes BenchmarkEchoStreamContextStub from ipc.ServerCall.
-func (s *BenchmarkEchoStreamContextStub) Init(call __ipc.ServerCall) {
+func (s *BenchmarkEchoStreamContextStub) Init(call ipc.ServerCall) {
s.ServerCall = call
}
@@ -337,7 +338,7 @@
return s.s.valRecv
}
func (s implBenchmarkEchoStreamContextRecv) Err() error {
- if s.s.errRecv == __io.EOF {
+ if s.s.errRecv == io.EOF {
return nil
}
return s.s.errRecv
diff --git a/runtimes/google/ipc/stream/proxy/protocol.vdl.go b/runtimes/google/ipc/stream/proxy/protocol.vdl.go
index 6b24382..226ecd4 100644
--- a/runtimes/google/ipc/stream/proxy/protocol.vdl.go
+++ b/runtimes/google/ipc/stream/proxy/protocol.vdl.go
@@ -4,8 +4,8 @@
package proxy
import (
- // The non-user imports are prefixed with "__" to prevent collisions.
- __vdl "v.io/core/veyron2/vdl"
+ // VDL system imports
+ "v.io/core/veyron2/vdl"
)
// Request is the message sent by a server to request that the proxy route
@@ -35,6 +35,6 @@
}
func init() {
- __vdl.Register(Request{})
- __vdl.Register(Response{})
+ vdl.Register(Request{})
+ vdl.Register(Response{})
}
diff --git a/security/agent/pingpong/wire.vdl.go b/security/agent/pingpong/wire.vdl.go
index 2f1915b..f7f3f77 100644
--- a/security/agent/pingpong/wire.vdl.go
+++ b/security/agent/pingpong/wire.vdl.go
@@ -4,10 +4,10 @@
package main
import (
- // The non-user imports are prefixed with "__" to prevent collisions.
- __veyron2 "v.io/core/veyron2"
- __context "v.io/core/veyron2/context"
- __ipc "v.io/core/veyron2/ipc"
+ // VDL system imports
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
)
// PingPongClientMethods is the client interface
@@ -15,20 +15,20 @@
//
// Simple service used in the agent tests.
type PingPongClientMethods interface {
- Ping(ctx *__context.T, message string, opts ...__ipc.CallOpt) (string, error)
+ Ping(ctx *context.T, message string, opts ...ipc.CallOpt) (string, error)
}
// PingPongClientStub adds universal methods to PingPongClientMethods.
type PingPongClientStub interface {
PingPongClientMethods
- __ipc.UniversalServiceMethods
+ ipc.UniversalServiceMethods
}
// PingPongClient returns a client stub for PingPong.
-func PingPongClient(name string, opts ...__ipc.BindOpt) PingPongClientStub {
- var client __ipc.Client
+func PingPongClient(name string, opts ...ipc.BindOpt) PingPongClientStub {
+ var client ipc.Client
for _, opt := range opts {
- if clientOpt, ok := opt.(__ipc.Client); ok {
+ if clientOpt, ok := opt.(ipc.Client); ok {
client = clientOpt
}
}
@@ -37,18 +37,18 @@
type implPingPongClientStub struct {
name string
- client __ipc.Client
+ client ipc.Client
}
-func (c implPingPongClientStub) c(ctx *__context.T) __ipc.Client {
+func (c implPingPongClientStub) c(ctx *context.T) ipc.Client {
if c.client != nil {
return c.client
}
- return __veyron2.GetClient(ctx)
+ return veyron2.GetClient(ctx)
}
-func (c implPingPongClientStub) Ping(ctx *__context.T, i0 string, opts ...__ipc.CallOpt) (o0 string, err error) {
- var call __ipc.Call
+func (c implPingPongClientStub) Ping(ctx *context.T, i0 string, opts ...ipc.CallOpt) (o0 string, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Ping", []interface{}{i0}, opts...); err != nil {
return
}
@@ -63,7 +63,7 @@
//
// Simple service used in the agent tests.
type PingPongServerMethods interface {
- Ping(ctx __ipc.ServerContext, message string) (string, error)
+ Ping(ctx ipc.ServerContext, message string) (string, error)
}
// PingPongServerStubMethods is the server interface containing
@@ -76,7 +76,7 @@
type PingPongServerStub interface {
PingPongServerStubMethods
// Describe the PingPong interfaces.
- Describe__() []__ipc.InterfaceDesc
+ Describe__() []ipc.InterfaceDesc
}
// PingPongServer returns a server stub for PingPong.
@@ -88,9 +88,9 @@
}
// Initialize GlobState; always check the stub itself first, to handle the
// case where the user has the Glob method defined in their VDL source.
- if gs := __ipc.NewGlobState(stub); gs != nil {
+ if gs := ipc.NewGlobState(stub); gs != nil {
stub.gs = gs
- } else if gs := __ipc.NewGlobState(impl); gs != nil {
+ } else if gs := ipc.NewGlobState(impl); gs != nil {
stub.gs = gs
}
return stub
@@ -98,36 +98,36 @@
type implPingPongServerStub struct {
impl PingPongServerMethods
- gs *__ipc.GlobState
+ gs *ipc.GlobState
}
-func (s implPingPongServerStub) Ping(ctx __ipc.ServerContext, i0 string) (string, error) {
+func (s implPingPongServerStub) Ping(ctx ipc.ServerContext, i0 string) (string, error) {
return s.impl.Ping(ctx, i0)
}
-func (s implPingPongServerStub) Globber() *__ipc.GlobState {
+func (s implPingPongServerStub) Globber() *ipc.GlobState {
return s.gs
}
-func (s implPingPongServerStub) Describe__() []__ipc.InterfaceDesc {
- return []__ipc.InterfaceDesc{PingPongDesc}
+func (s implPingPongServerStub) Describe__() []ipc.InterfaceDesc {
+ return []ipc.InterfaceDesc{PingPongDesc}
}
// PingPongDesc describes the PingPong interface.
-var PingPongDesc __ipc.InterfaceDesc = descPingPong
+var PingPongDesc ipc.InterfaceDesc = descPingPong
// descPingPong hides the desc to keep godoc clean.
-var descPingPong = __ipc.InterfaceDesc{
+var descPingPong = ipc.InterfaceDesc{
Name: "PingPong",
PkgPath: "v.io/core/veyron/security/agent/pingpong",
Doc: "// Simple service used in the agent tests.",
- Methods: []__ipc.MethodDesc{
+ Methods: []ipc.MethodDesc{
{
Name: "Ping",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"message", ``}, // string
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // string
{"", ``}, // error
},
diff --git a/security/agent/server/wire.vdl.go b/security/agent/server/wire.vdl.go
index 4a8922a..dcd1e79 100644
--- a/security/agent/server/wire.vdl.go
+++ b/security/agent/server/wire.vdl.go
@@ -4,48 +4,49 @@
package server
import (
- "v.io/core/veyron2/security"
+ // VDL system imports
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/vdl"
- // The non-user imports are prefixed with "__" to prevent collisions.
- __veyron2 "v.io/core/veyron2"
- __context "v.io/core/veyron2/context"
- __ipc "v.io/core/veyron2/ipc"
- __vdl "v.io/core/veyron2/vdl"
+ // VDL user imports
+ "v.io/core/veyron2/security"
)
// AgentClientMethods is the client interface
// containing Agent methods.
type AgentClientMethods interface {
- Bless(ctx *__context.T, key []byte, wit security.WireBlessings, extension string, caveat security.Caveat, additionalCaveats []security.Caveat, opts ...__ipc.CallOpt) (security.WireBlessings, error)
- BlessSelf(ctx *__context.T, name string, caveats []security.Caveat, opts ...__ipc.CallOpt) (security.WireBlessings, error)
- Sign(ctx *__context.T, message []byte, opts ...__ipc.CallOpt) (security.Signature, error)
- MintDischarge(ctx *__context.T, tp __vdl.AnyRep, caveat security.Caveat, additionalCaveats []security.Caveat, opts ...__ipc.CallOpt) (__vdl.AnyRep, error)
- PublicKey(*__context.T, ...__ipc.CallOpt) ([]byte, error)
- BlessingsByName(ctx *__context.T, name security.BlessingPattern, opts ...__ipc.CallOpt) ([]security.WireBlessings, error)
- BlessingsInfo(ctx *__context.T, blessings security.WireBlessings, opts ...__ipc.CallOpt) (map[string][]security.Caveat, error)
- AddToRoots(ctx *__context.T, blessing security.WireBlessings, opts ...__ipc.CallOpt) error
- BlessingStoreSet(ctx *__context.T, blessings security.WireBlessings, forPeers security.BlessingPattern, opts ...__ipc.CallOpt) (security.WireBlessings, error)
- BlessingStoreForPeer(ctx *__context.T, peerBlessings []string, opts ...__ipc.CallOpt) (security.WireBlessings, error)
- BlessingStoreSetDefault(ctx *__context.T, blessings security.WireBlessings, opts ...__ipc.CallOpt) error
- BlessingStoreDefault(*__context.T, ...__ipc.CallOpt) (security.WireBlessings, error)
- BlessingStorePeerBlessings(*__context.T, ...__ipc.CallOpt) (map[security.BlessingPattern]security.WireBlessings, error)
- BlessingStoreDebugString(*__context.T, ...__ipc.CallOpt) (string, error)
- BlessingRootsAdd(ctx *__context.T, root []byte, pattern security.BlessingPattern, opts ...__ipc.CallOpt) error
- BlessingRootsRecognized(ctx *__context.T, root []byte, blessing string, opts ...__ipc.CallOpt) error
- BlessingRootsDebugString(*__context.T, ...__ipc.CallOpt) (string, error)
+ Bless(ctx *context.T, key []byte, wit security.WireBlessings, extension string, caveat security.Caveat, additionalCaveats []security.Caveat, opts ...ipc.CallOpt) (security.WireBlessings, error)
+ BlessSelf(ctx *context.T, name string, caveats []security.Caveat, opts ...ipc.CallOpt) (security.WireBlessings, error)
+ Sign(ctx *context.T, message []byte, opts ...ipc.CallOpt) (security.Signature, error)
+ MintDischarge(ctx *context.T, tp vdl.AnyRep, caveat security.Caveat, additionalCaveats []security.Caveat, opts ...ipc.CallOpt) (vdl.AnyRep, error)
+ PublicKey(*context.T, ...ipc.CallOpt) ([]byte, error)
+ BlessingsByName(ctx *context.T, name security.BlessingPattern, opts ...ipc.CallOpt) ([]security.WireBlessings, error)
+ BlessingsInfo(ctx *context.T, blessings security.WireBlessings, opts ...ipc.CallOpt) (map[string][]security.Caveat, error)
+ AddToRoots(ctx *context.T, blessing security.WireBlessings, opts ...ipc.CallOpt) error
+ BlessingStoreSet(ctx *context.T, blessings security.WireBlessings, forPeers security.BlessingPattern, opts ...ipc.CallOpt) (security.WireBlessings, error)
+ BlessingStoreForPeer(ctx *context.T, peerBlessings []string, opts ...ipc.CallOpt) (security.WireBlessings, error)
+ BlessingStoreSetDefault(ctx *context.T, blessings security.WireBlessings, opts ...ipc.CallOpt) error
+ BlessingStoreDefault(*context.T, ...ipc.CallOpt) (security.WireBlessings, error)
+ BlessingStorePeerBlessings(*context.T, ...ipc.CallOpt) (map[security.BlessingPattern]security.WireBlessings, error)
+ BlessingStoreDebugString(*context.T, ...ipc.CallOpt) (string, error)
+ BlessingRootsAdd(ctx *context.T, root []byte, pattern security.BlessingPattern, opts ...ipc.CallOpt) error
+ BlessingRootsRecognized(ctx *context.T, root []byte, blessing string, opts ...ipc.CallOpt) error
+ BlessingRootsDebugString(*context.T, ...ipc.CallOpt) (string, error)
}
// AgentClientStub adds universal methods to AgentClientMethods.
type AgentClientStub interface {
AgentClientMethods
- __ipc.UniversalServiceMethods
+ ipc.UniversalServiceMethods
}
// AgentClient returns a client stub for Agent.
-func AgentClient(name string, opts ...__ipc.BindOpt) AgentClientStub {
- var client __ipc.Client
+func AgentClient(name string, opts ...ipc.BindOpt) AgentClientStub {
+ var client ipc.Client
for _, opt := range opts {
- if clientOpt, ok := opt.(__ipc.Client); ok {
+ if clientOpt, ok := opt.(ipc.Client); ok {
client = clientOpt
}
}
@@ -54,18 +55,18 @@
type implAgentClientStub struct {
name string
- client __ipc.Client
+ client ipc.Client
}
-func (c implAgentClientStub) c(ctx *__context.T) __ipc.Client {
+func (c implAgentClientStub) c(ctx *context.T) ipc.Client {
if c.client != nil {
return c.client
}
- return __veyron2.GetClient(ctx)
+ 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) {
- var call __ipc.Call
+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) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Bless", []interface{}{i0, i1, i2, i3, i4}, opts...); err != nil {
return
}
@@ -75,8 +76,8 @@
return
}
-func (c implAgentClientStub) BlessSelf(ctx *__context.T, i0 string, i1 []security.Caveat, opts ...__ipc.CallOpt) (o0 security.WireBlessings, err error) {
- var call __ipc.Call
+func (c implAgentClientStub) BlessSelf(ctx *context.T, i0 string, i1 []security.Caveat, opts ...ipc.CallOpt) (o0 security.WireBlessings, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessSelf", []interface{}{i0, i1}, opts...); err != nil {
return
}
@@ -86,8 +87,8 @@
return
}
-func (c implAgentClientStub) Sign(ctx *__context.T, i0 []byte, opts ...__ipc.CallOpt) (o0 security.Signature, err error) {
- var call __ipc.Call
+func (c implAgentClientStub) Sign(ctx *context.T, i0 []byte, opts ...ipc.CallOpt) (o0 security.Signature, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Sign", []interface{}{i0}, opts...); err != nil {
return
}
@@ -97,8 +98,8 @@
return
}
-func (c implAgentClientStub) MintDischarge(ctx *__context.T, i0 __vdl.AnyRep, i1 security.Caveat, i2 []security.Caveat, opts ...__ipc.CallOpt) (o0 __vdl.AnyRep, err error) {
- var call __ipc.Call
+func (c implAgentClientStub) MintDischarge(ctx *context.T, i0 vdl.AnyRep, i1 security.Caveat, i2 []security.Caveat, opts ...ipc.CallOpt) (o0 vdl.AnyRep, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "MintDischarge", []interface{}{i0, i1, i2}, opts...); err != nil {
return
}
@@ -108,8 +109,8 @@
return
}
-func (c implAgentClientStub) PublicKey(ctx *__context.T, opts ...__ipc.CallOpt) (o0 []byte, err error) {
- var call __ipc.Call
+func (c implAgentClientStub) PublicKey(ctx *context.T, opts ...ipc.CallOpt) (o0 []byte, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "PublicKey", nil, opts...); err != nil {
return
}
@@ -119,8 +120,8 @@
return
}
-func (c implAgentClientStub) BlessingsByName(ctx *__context.T, i0 security.BlessingPattern, opts ...__ipc.CallOpt) (o0 []security.WireBlessings, err error) {
- var call __ipc.Call
+func (c implAgentClientStub) BlessingsByName(ctx *context.T, i0 security.BlessingPattern, opts ...ipc.CallOpt) (o0 []security.WireBlessings, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessingsByName", []interface{}{i0}, opts...); err != nil {
return
}
@@ -130,8 +131,8 @@
return
}
-func (c implAgentClientStub) BlessingsInfo(ctx *__context.T, i0 security.WireBlessings, opts ...__ipc.CallOpt) (o0 map[string][]security.Caveat, err error) {
- var call __ipc.Call
+func (c implAgentClientStub) BlessingsInfo(ctx *context.T, i0 security.WireBlessings, opts ...ipc.CallOpt) (o0 map[string][]security.Caveat, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessingsInfo", []interface{}{i0}, opts...); err != nil {
return
}
@@ -141,8 +142,8 @@
return
}
-func (c implAgentClientStub) AddToRoots(ctx *__context.T, i0 security.WireBlessings, opts ...__ipc.CallOpt) (err error) {
- var call __ipc.Call
+func (c implAgentClientStub) AddToRoots(ctx *context.T, i0 security.WireBlessings, opts ...ipc.CallOpt) (err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "AddToRoots", []interface{}{i0}, opts...); err != nil {
return
}
@@ -152,8 +153,8 @@
return
}
-func (c implAgentClientStub) BlessingStoreSet(ctx *__context.T, i0 security.WireBlessings, i1 security.BlessingPattern, opts ...__ipc.CallOpt) (o0 security.WireBlessings, err error) {
- var call __ipc.Call
+func (c implAgentClientStub) BlessingStoreSet(ctx *context.T, i0 security.WireBlessings, i1 security.BlessingPattern, opts ...ipc.CallOpt) (o0 security.WireBlessings, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessingStoreSet", []interface{}{i0, i1}, opts...); err != nil {
return
}
@@ -163,8 +164,8 @@
return
}
-func (c implAgentClientStub) BlessingStoreForPeer(ctx *__context.T, i0 []string, opts ...__ipc.CallOpt) (o0 security.WireBlessings, err error) {
- var call __ipc.Call
+func (c implAgentClientStub) BlessingStoreForPeer(ctx *context.T, i0 []string, opts ...ipc.CallOpt) (o0 security.WireBlessings, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessingStoreForPeer", []interface{}{i0}, opts...); err != nil {
return
}
@@ -174,8 +175,8 @@
return
}
-func (c implAgentClientStub) BlessingStoreSetDefault(ctx *__context.T, i0 security.WireBlessings, opts ...__ipc.CallOpt) (err error) {
- var call __ipc.Call
+func (c implAgentClientStub) BlessingStoreSetDefault(ctx *context.T, i0 security.WireBlessings, opts ...ipc.CallOpt) (err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessingStoreSetDefault", []interface{}{i0}, opts...); err != nil {
return
}
@@ -185,8 +186,8 @@
return
}
-func (c implAgentClientStub) BlessingStoreDefault(ctx *__context.T, opts ...__ipc.CallOpt) (o0 security.WireBlessings, err error) {
- var call __ipc.Call
+func (c implAgentClientStub) BlessingStoreDefault(ctx *context.T, opts ...ipc.CallOpt) (o0 security.WireBlessings, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessingStoreDefault", nil, opts...); err != nil {
return
}
@@ -196,8 +197,8 @@
return
}
-func (c implAgentClientStub) BlessingStorePeerBlessings(ctx *__context.T, opts ...__ipc.CallOpt) (o0 map[security.BlessingPattern]security.WireBlessings, err error) {
- var call __ipc.Call
+func (c implAgentClientStub) BlessingStorePeerBlessings(ctx *context.T, opts ...ipc.CallOpt) (o0 map[security.BlessingPattern]security.WireBlessings, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessingStorePeerBlessings", nil, opts...); err != nil {
return
}
@@ -207,8 +208,8 @@
return
}
-func (c implAgentClientStub) BlessingStoreDebugString(ctx *__context.T, opts ...__ipc.CallOpt) (o0 string, err error) {
- var call __ipc.Call
+func (c implAgentClientStub) BlessingStoreDebugString(ctx *context.T, opts ...ipc.CallOpt) (o0 string, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessingStoreDebugString", nil, opts...); err != nil {
return
}
@@ -218,8 +219,8 @@
return
}
-func (c implAgentClientStub) BlessingRootsAdd(ctx *__context.T, i0 []byte, i1 security.BlessingPattern, opts ...__ipc.CallOpt) (err error) {
- var call __ipc.Call
+func (c implAgentClientStub) BlessingRootsAdd(ctx *context.T, i0 []byte, i1 security.BlessingPattern, opts ...ipc.CallOpt) (err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessingRootsAdd", []interface{}{i0, i1}, opts...); err != nil {
return
}
@@ -229,8 +230,8 @@
return
}
-func (c implAgentClientStub) BlessingRootsRecognized(ctx *__context.T, i0 []byte, i1 string, opts ...__ipc.CallOpt) (err error) {
- var call __ipc.Call
+func (c implAgentClientStub) BlessingRootsRecognized(ctx *context.T, i0 []byte, i1 string, opts ...ipc.CallOpt) (err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessingRootsRecognized", []interface{}{i0, i1}, opts...); err != nil {
return
}
@@ -240,8 +241,8 @@
return
}
-func (c implAgentClientStub) BlessingRootsDebugString(ctx *__context.T, opts ...__ipc.CallOpt) (o0 string, err error) {
- var call __ipc.Call
+func (c implAgentClientStub) BlessingRootsDebugString(ctx *context.T, opts ...ipc.CallOpt) (o0 string, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessingRootsDebugString", nil, opts...); err != nil {
return
}
@@ -254,23 +255,23 @@
// AgentServerMethods is the interface a server writer
// implements for Agent.
type AgentServerMethods interface {
- Bless(ctx __ipc.ServerContext, key []byte, wit security.WireBlessings, extension string, caveat security.Caveat, additionalCaveats []security.Caveat) (security.WireBlessings, error)
- BlessSelf(ctx __ipc.ServerContext, name string, caveats []security.Caveat) (security.WireBlessings, error)
- Sign(ctx __ipc.ServerContext, message []byte) (security.Signature, error)
- MintDischarge(ctx __ipc.ServerContext, tp __vdl.AnyRep, caveat security.Caveat, additionalCaveats []security.Caveat) (__vdl.AnyRep, error)
- PublicKey(__ipc.ServerContext) ([]byte, error)
- BlessingsByName(ctx __ipc.ServerContext, name security.BlessingPattern) ([]security.WireBlessings, error)
- BlessingsInfo(ctx __ipc.ServerContext, blessings security.WireBlessings) (map[string][]security.Caveat, error)
- AddToRoots(ctx __ipc.ServerContext, blessing security.WireBlessings) error
- BlessingStoreSet(ctx __ipc.ServerContext, blessings security.WireBlessings, forPeers security.BlessingPattern) (security.WireBlessings, error)
- BlessingStoreForPeer(ctx __ipc.ServerContext, peerBlessings []string) (security.WireBlessings, error)
- BlessingStoreSetDefault(ctx __ipc.ServerContext, blessings security.WireBlessings) error
- BlessingStoreDefault(__ipc.ServerContext) (security.WireBlessings, error)
- BlessingStorePeerBlessings(__ipc.ServerContext) (map[security.BlessingPattern]security.WireBlessings, error)
- BlessingStoreDebugString(__ipc.ServerContext) (string, error)
- BlessingRootsAdd(ctx __ipc.ServerContext, root []byte, pattern security.BlessingPattern) error
- BlessingRootsRecognized(ctx __ipc.ServerContext, root []byte, blessing string) error
- BlessingRootsDebugString(__ipc.ServerContext) (string, error)
+ Bless(ctx ipc.ServerContext, key []byte, wit security.WireBlessings, extension string, caveat security.Caveat, additionalCaveats []security.Caveat) (security.WireBlessings, error)
+ BlessSelf(ctx ipc.ServerContext, name string, caveats []security.Caveat) (security.WireBlessings, error)
+ Sign(ctx ipc.ServerContext, message []byte) (security.Signature, error)
+ MintDischarge(ctx ipc.ServerContext, tp vdl.AnyRep, caveat security.Caveat, additionalCaveats []security.Caveat) (vdl.AnyRep, error)
+ PublicKey(ipc.ServerContext) ([]byte, error)
+ BlessingsByName(ctx ipc.ServerContext, name security.BlessingPattern) ([]security.WireBlessings, error)
+ BlessingsInfo(ctx ipc.ServerContext, blessings security.WireBlessings) (map[string][]security.Caveat, error)
+ AddToRoots(ctx ipc.ServerContext, blessing security.WireBlessings) error
+ BlessingStoreSet(ctx ipc.ServerContext, blessings security.WireBlessings, forPeers security.BlessingPattern) (security.WireBlessings, error)
+ BlessingStoreForPeer(ctx ipc.ServerContext, peerBlessings []string) (security.WireBlessings, error)
+ BlessingStoreSetDefault(ctx ipc.ServerContext, blessings security.WireBlessings) error
+ BlessingStoreDefault(ipc.ServerContext) (security.WireBlessings, error)
+ BlessingStorePeerBlessings(ipc.ServerContext) (map[security.BlessingPattern]security.WireBlessings, error)
+ BlessingStoreDebugString(ipc.ServerContext) (string, error)
+ BlessingRootsAdd(ctx ipc.ServerContext, root []byte, pattern security.BlessingPattern) error
+ BlessingRootsRecognized(ctx ipc.ServerContext, root []byte, blessing string) error
+ BlessingRootsDebugString(ipc.ServerContext) (string, error)
}
// AgentServerStubMethods is the server interface containing
@@ -283,7 +284,7 @@
type AgentServerStub interface {
AgentServerStubMethods
// Describe the Agent interfaces.
- Describe__() []__ipc.InterfaceDesc
+ Describe__() []ipc.InterfaceDesc
}
// AgentServer returns a server stub for Agent.
@@ -295,9 +296,9 @@
}
// Initialize GlobState; always check the stub itself first, to handle the
// case where the user has the Glob method defined in their VDL source.
- if gs := __ipc.NewGlobState(stub); gs != nil {
+ if gs := ipc.NewGlobState(stub); gs != nil {
stub.gs = gs
- } else if gs := __ipc.NewGlobState(impl); gs != nil {
+ } else if gs := ipc.NewGlobState(impl); gs != nil {
stub.gs = gs
}
return stub
@@ -305,250 +306,250 @@
type implAgentServerStub struct {
impl AgentServerMethods
- gs *__ipc.GlobState
+ gs *ipc.GlobState
}
-func (s implAgentServerStub) Bless(ctx __ipc.ServerContext, i0 []byte, i1 security.WireBlessings, i2 string, i3 security.Caveat, i4 []security.Caveat) (security.WireBlessings, error) {
+func (s implAgentServerStub) Bless(ctx ipc.ServerContext, i0 []byte, i1 security.WireBlessings, i2 string, i3 security.Caveat, i4 []security.Caveat) (security.WireBlessings, error) {
return s.impl.Bless(ctx, i0, i1, i2, i3, i4)
}
-func (s implAgentServerStub) BlessSelf(ctx __ipc.ServerContext, i0 string, i1 []security.Caveat) (security.WireBlessings, error) {
+func (s implAgentServerStub) BlessSelf(ctx ipc.ServerContext, i0 string, i1 []security.Caveat) (security.WireBlessings, error) {
return s.impl.BlessSelf(ctx, i0, i1)
}
-func (s implAgentServerStub) Sign(ctx __ipc.ServerContext, i0 []byte) (security.Signature, error) {
+func (s implAgentServerStub) Sign(ctx ipc.ServerContext, i0 []byte) (security.Signature, error) {
return s.impl.Sign(ctx, i0)
}
-func (s implAgentServerStub) MintDischarge(ctx __ipc.ServerContext, i0 __vdl.AnyRep, i1 security.Caveat, i2 []security.Caveat) (__vdl.AnyRep, error) {
+func (s implAgentServerStub) MintDischarge(ctx ipc.ServerContext, i0 vdl.AnyRep, i1 security.Caveat, i2 []security.Caveat) (vdl.AnyRep, error) {
return s.impl.MintDischarge(ctx, i0, i1, i2)
}
-func (s implAgentServerStub) PublicKey(ctx __ipc.ServerContext) ([]byte, error) {
+func (s implAgentServerStub) PublicKey(ctx ipc.ServerContext) ([]byte, error) {
return s.impl.PublicKey(ctx)
}
-func (s implAgentServerStub) BlessingsByName(ctx __ipc.ServerContext, i0 security.BlessingPattern) ([]security.WireBlessings, error) {
+func (s implAgentServerStub) BlessingsByName(ctx ipc.ServerContext, i0 security.BlessingPattern) ([]security.WireBlessings, error) {
return s.impl.BlessingsByName(ctx, i0)
}
-func (s implAgentServerStub) BlessingsInfo(ctx __ipc.ServerContext, i0 security.WireBlessings) (map[string][]security.Caveat, error) {
+func (s implAgentServerStub) BlessingsInfo(ctx ipc.ServerContext, i0 security.WireBlessings) (map[string][]security.Caveat, error) {
return s.impl.BlessingsInfo(ctx, i0)
}
-func (s implAgentServerStub) AddToRoots(ctx __ipc.ServerContext, i0 security.WireBlessings) error {
+func (s implAgentServerStub) AddToRoots(ctx ipc.ServerContext, i0 security.WireBlessings) error {
return s.impl.AddToRoots(ctx, i0)
}
-func (s implAgentServerStub) BlessingStoreSet(ctx __ipc.ServerContext, i0 security.WireBlessings, i1 security.BlessingPattern) (security.WireBlessings, error) {
+func (s implAgentServerStub) BlessingStoreSet(ctx ipc.ServerContext, i0 security.WireBlessings, i1 security.BlessingPattern) (security.WireBlessings, error) {
return s.impl.BlessingStoreSet(ctx, i0, i1)
}
-func (s implAgentServerStub) BlessingStoreForPeer(ctx __ipc.ServerContext, i0 []string) (security.WireBlessings, error) {
+func (s implAgentServerStub) BlessingStoreForPeer(ctx ipc.ServerContext, i0 []string) (security.WireBlessings, error) {
return s.impl.BlessingStoreForPeer(ctx, i0)
}
-func (s implAgentServerStub) BlessingStoreSetDefault(ctx __ipc.ServerContext, i0 security.WireBlessings) error {
+func (s implAgentServerStub) BlessingStoreSetDefault(ctx ipc.ServerContext, i0 security.WireBlessings) error {
return s.impl.BlessingStoreSetDefault(ctx, i0)
}
-func (s implAgentServerStub) BlessingStoreDefault(ctx __ipc.ServerContext) (security.WireBlessings, error) {
+func (s implAgentServerStub) BlessingStoreDefault(ctx ipc.ServerContext) (security.WireBlessings, error) {
return s.impl.BlessingStoreDefault(ctx)
}
-func (s implAgentServerStub) BlessingStorePeerBlessings(ctx __ipc.ServerContext) (map[security.BlessingPattern]security.WireBlessings, error) {
+func (s implAgentServerStub) BlessingStorePeerBlessings(ctx ipc.ServerContext) (map[security.BlessingPattern]security.WireBlessings, error) {
return s.impl.BlessingStorePeerBlessings(ctx)
}
-func (s implAgentServerStub) BlessingStoreDebugString(ctx __ipc.ServerContext) (string, error) {
+func (s implAgentServerStub) BlessingStoreDebugString(ctx ipc.ServerContext) (string, error) {
return s.impl.BlessingStoreDebugString(ctx)
}
-func (s implAgentServerStub) BlessingRootsAdd(ctx __ipc.ServerContext, i0 []byte, i1 security.BlessingPattern) error {
+func (s implAgentServerStub) BlessingRootsAdd(ctx ipc.ServerContext, i0 []byte, i1 security.BlessingPattern) error {
return s.impl.BlessingRootsAdd(ctx, i0, i1)
}
-func (s implAgentServerStub) BlessingRootsRecognized(ctx __ipc.ServerContext, i0 []byte, i1 string) error {
+func (s implAgentServerStub) BlessingRootsRecognized(ctx ipc.ServerContext, i0 []byte, i1 string) error {
return s.impl.BlessingRootsRecognized(ctx, i0, i1)
}
-func (s implAgentServerStub) BlessingRootsDebugString(ctx __ipc.ServerContext) (string, error) {
+func (s implAgentServerStub) BlessingRootsDebugString(ctx ipc.ServerContext) (string, error) {
return s.impl.BlessingRootsDebugString(ctx)
}
-func (s implAgentServerStub) Globber() *__ipc.GlobState {
+func (s implAgentServerStub) Globber() *ipc.GlobState {
return s.gs
}
-func (s implAgentServerStub) Describe__() []__ipc.InterfaceDesc {
- return []__ipc.InterfaceDesc{AgentDesc}
+func (s implAgentServerStub) Describe__() []ipc.InterfaceDesc {
+ return []ipc.InterfaceDesc{AgentDesc}
}
// AgentDesc describes the Agent interface.
-var AgentDesc __ipc.InterfaceDesc = descAgent
+var AgentDesc ipc.InterfaceDesc = descAgent
// descAgent hides the desc to keep godoc clean.
-var descAgent = __ipc.InterfaceDesc{
+var descAgent = ipc.InterfaceDesc{
Name: "Agent",
PkgPath: "v.io/core/veyron/security/agent/server",
- Methods: []__ipc.MethodDesc{
+ Methods: []ipc.MethodDesc{
{
Name: "Bless",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"key", ``}, // []byte
{"wit", ``}, // security.WireBlessings
{"extension", ``}, // string
{"caveat", ``}, // security.Caveat
{"additionalCaveats", ``}, // []security.Caveat
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // security.WireBlessings
{"", ``}, // error
},
},
{
Name: "BlessSelf",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"name", ``}, // string
{"caveats", ``}, // []security.Caveat
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // security.WireBlessings
{"", ``}, // error
},
},
{
Name: "Sign",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"message", ``}, // []byte
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // security.Signature
{"", ``}, // error
},
},
{
Name: "MintDischarge",
- InArgs: []__ipc.ArgDesc{
- {"tp", ``}, // __vdl.AnyRep
+ InArgs: []ipc.ArgDesc{
+ {"tp", ``}, // vdl.AnyRep
{"caveat", ``}, // security.Caveat
{"additionalCaveats", ``}, // []security.Caveat
},
- OutArgs: []__ipc.ArgDesc{
- {"", ``}, // __vdl.AnyRep
+ OutArgs: []ipc.ArgDesc{
+ {"", ``}, // vdl.AnyRep
{"", ``}, // error
},
},
{
Name: "PublicKey",
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // []byte
{"", ``}, // error
},
},
{
Name: "BlessingsByName",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"name", ``}, // security.BlessingPattern
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // []security.WireBlessings
{"", ``}, // error
},
},
{
Name: "BlessingsInfo",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"blessings", ``}, // security.WireBlessings
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // map[string][]security.Caveat
{"", ``}, // error
},
},
{
Name: "AddToRoots",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"blessing", ``}, // security.WireBlessings
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
},
{
Name: "BlessingStoreSet",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"blessings", ``}, // security.WireBlessings
{"forPeers", ``}, // security.BlessingPattern
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // security.WireBlessings
{"", ``}, // error
},
},
{
Name: "BlessingStoreForPeer",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"peerBlessings", ``}, // []string
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // security.WireBlessings
{"", ``}, // error
},
},
{
Name: "BlessingStoreSetDefault",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"blessings", ``}, // security.WireBlessings
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
},
{
Name: "BlessingStoreDefault",
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // security.WireBlessings
{"", ``}, // error
},
},
{
Name: "BlessingStorePeerBlessings",
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // map[security.BlessingPattern]security.WireBlessings
{"", ``}, // error
},
},
{
Name: "BlessingStoreDebugString",
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // string
{"", ``}, // error
},
},
{
Name: "BlessingRootsAdd",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"root", ``}, // []byte
{"pattern", ``}, // security.BlessingPattern
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
},
{
Name: "BlessingRootsRecognized",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"root", ``}, // []byte
{"blessing", ``}, // string
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
},
{
Name: "BlessingRootsDebugString",
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // string
{"", ``}, // error
},
diff --git a/security/serialization/types.vdl.go b/security/serialization/types.vdl.go
index daa5cac..5946e77 100644
--- a/security/serialization/types.vdl.go
+++ b/security/serialization/types.vdl.go
@@ -4,10 +4,11 @@
package serialization
import (
- "v.io/core/veyron2/security"
+ // VDL system imports
+ "v.io/core/veyron2/vdl"
- // The non-user imports are prefixed with "__" to prevent collisions.
- __vdl "v.io/core/veyron2/vdl"
+ // VDL user imports
+ "v.io/core/veyron2/security"
)
type SignedHeader struct {
@@ -66,7 +67,7 @@
func (x SignedDataHash) __VDLReflect(__SignedDataReflect) {}
func init() {
- __vdl.Register(SignedHeader{})
- __vdl.Register(HashCode{})
- __vdl.Register(SignedData(SignedDataSignature{security.Signature{}}))
+ vdl.Register(SignedHeader{})
+ vdl.Register(HashCode{})
+ vdl.Register(SignedData(SignedDataSignature{security.Signature{}}))
}
diff --git a/services/identity/identity.vdl.go b/services/identity/identity.vdl.go
index 97d9997..4649ec8 100644
--- a/services/identity/identity.vdl.go
+++ b/services/identity/identity.vdl.go
@@ -5,12 +5,13 @@
package identity
import (
- "v.io/core/veyron2/security"
+ // VDL system imports
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
- // The non-user imports are prefixed with "__" to prevent collisions.
- __veyron2 "v.io/core/veyron2"
- __context "v.io/core/veyron2/context"
- __ipc "v.io/core/veyron2/ipc"
+ // VDL user imports
+ "v.io/core/veyron2/security"
)
// OAuthBlesserClientMethods is the client interface
@@ -32,20 +33,20 @@
type OAuthBlesserClientMethods interface {
// BlessUsingAccessToken uses the provided access token to obtain the email
// address and returns a blessing along with the email address.
- BlessUsingAccessToken(ctx *__context.T, token string, opts ...__ipc.CallOpt) (blessing security.WireBlessings, email string, err error)
+ BlessUsingAccessToken(ctx *context.T, token string, opts ...ipc.CallOpt) (blessing security.WireBlessings, email string, err error)
}
// OAuthBlesserClientStub adds universal methods to OAuthBlesserClientMethods.
type OAuthBlesserClientStub interface {
OAuthBlesserClientMethods
- __ipc.UniversalServiceMethods
+ ipc.UniversalServiceMethods
}
// OAuthBlesserClient returns a client stub for OAuthBlesser.
-func OAuthBlesserClient(name string, opts ...__ipc.BindOpt) OAuthBlesserClientStub {
- var client __ipc.Client
+func OAuthBlesserClient(name string, opts ...ipc.BindOpt) OAuthBlesserClientStub {
+ var client ipc.Client
for _, opt := range opts {
- if clientOpt, ok := opt.(__ipc.Client); ok {
+ if clientOpt, ok := opt.(ipc.Client); ok {
client = clientOpt
}
}
@@ -54,18 +55,18 @@
type implOAuthBlesserClientStub struct {
name string
- client __ipc.Client
+ client ipc.Client
}
-func (c implOAuthBlesserClientStub) c(ctx *__context.T) __ipc.Client {
+func (c implOAuthBlesserClientStub) c(ctx *context.T) ipc.Client {
if c.client != nil {
return c.client
}
- return __veyron2.GetClient(ctx)
+ return veyron2.GetClient(ctx)
}
-func (c implOAuthBlesserClientStub) BlessUsingAccessToken(ctx *__context.T, i0 string, opts ...__ipc.CallOpt) (o0 security.WireBlessings, o1 string, err error) {
- var call __ipc.Call
+func (c implOAuthBlesserClientStub) BlessUsingAccessToken(ctx *context.T, i0 string, opts ...ipc.CallOpt) (o0 security.WireBlessings, o1 string, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "BlessUsingAccessToken", []interface{}{i0}, opts...); err != nil {
return
}
@@ -94,7 +95,7 @@
type OAuthBlesserServerMethods interface {
// BlessUsingAccessToken uses the provided access token to obtain the email
// address and returns a blessing along with the email address.
- BlessUsingAccessToken(ctx __ipc.ServerContext, token string) (blessing security.WireBlessings, email string, err error)
+ BlessUsingAccessToken(ctx ipc.ServerContext, token string) (blessing security.WireBlessings, email string, err error)
}
// OAuthBlesserServerStubMethods is the server interface containing
@@ -107,7 +108,7 @@
type OAuthBlesserServerStub interface {
OAuthBlesserServerStubMethods
// Describe the OAuthBlesser interfaces.
- Describe__() []__ipc.InterfaceDesc
+ Describe__() []ipc.InterfaceDesc
}
// OAuthBlesserServer returns a server stub for OAuthBlesser.
@@ -119,9 +120,9 @@
}
// Initialize GlobState; always check the stub itself first, to handle the
// case where the user has the Glob method defined in their VDL source.
- if gs := __ipc.NewGlobState(stub); gs != nil {
+ if gs := ipc.NewGlobState(stub); gs != nil {
stub.gs = gs
- } else if gs := __ipc.NewGlobState(impl); gs != nil {
+ } else if gs := ipc.NewGlobState(impl); gs != nil {
stub.gs = gs
}
return stub
@@ -129,37 +130,37 @@
type implOAuthBlesserServerStub struct {
impl OAuthBlesserServerMethods
- gs *__ipc.GlobState
+ gs *ipc.GlobState
}
-func (s implOAuthBlesserServerStub) BlessUsingAccessToken(ctx __ipc.ServerContext, i0 string) (security.WireBlessings, string, error) {
+func (s implOAuthBlesserServerStub) BlessUsingAccessToken(ctx ipc.ServerContext, i0 string) (security.WireBlessings, string, error) {
return s.impl.BlessUsingAccessToken(ctx, i0)
}
-func (s implOAuthBlesserServerStub) Globber() *__ipc.GlobState {
+func (s implOAuthBlesserServerStub) Globber() *ipc.GlobState {
return s.gs
}
-func (s implOAuthBlesserServerStub) Describe__() []__ipc.InterfaceDesc {
- return []__ipc.InterfaceDesc{OAuthBlesserDesc}
+func (s implOAuthBlesserServerStub) Describe__() []ipc.InterfaceDesc {
+ return []ipc.InterfaceDesc{OAuthBlesserDesc}
}
// OAuthBlesserDesc describes the OAuthBlesser interface.
-var OAuthBlesserDesc __ipc.InterfaceDesc = descOAuthBlesser
+var OAuthBlesserDesc ipc.InterfaceDesc = descOAuthBlesser
// descOAuthBlesser hides the desc to keep godoc clean.
-var descOAuthBlesser = __ipc.InterfaceDesc{
+var descOAuthBlesser = ipc.InterfaceDesc{
Name: "OAuthBlesser",
PkgPath: "v.io/core/veyron/services/identity",
Doc: "// OAuthBlesser exchanges OAuth access tokens for\n// an email address from an OAuth-based identity provider and uses the email\n// address obtained to bless the client.\n//\n// OAuth is described in RFC 6749 (http://tools.ietf.org/html/rfc6749),\n// though the Google implementation also has informative documentation at\n// https://developers.google.com/accounts/docs/OAuth2\n//\n// WARNING: There is no binding between the channel over which the access token\n// was obtained (typically https) and the channel used to make the RPC (a\n// veyron virtual circuit).\n// Thus, if Mallory possesses the access token associated with Alice's account,\n// she may be able to obtain a blessing with Alice's name on it.",
- Methods: []__ipc.MethodDesc{
+ Methods: []ipc.MethodDesc{
{
Name: "BlessUsingAccessToken",
Doc: "// BlessUsingAccessToken uses the provided access token to obtain the email\n// address and returns a blessing along with the email address.",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"token", ``}, // string
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"blessing", ``}, // security.WireBlessings
{"email", ``}, // string
{"err", ``}, // error
@@ -175,20 +176,20 @@
type MacaroonBlesserClientMethods interface {
// Bless uses the provided macaroon (which contains email and caveats)
// to return a blessing for the client.
- Bless(ctx *__context.T, macaroon string, opts ...__ipc.CallOpt) (blessing security.WireBlessings, err error)
+ Bless(ctx *context.T, macaroon string, opts ...ipc.CallOpt) (blessing security.WireBlessings, err error)
}
// MacaroonBlesserClientStub adds universal methods to MacaroonBlesserClientMethods.
type MacaroonBlesserClientStub interface {
MacaroonBlesserClientMethods
- __ipc.UniversalServiceMethods
+ ipc.UniversalServiceMethods
}
// MacaroonBlesserClient returns a client stub for MacaroonBlesser.
-func MacaroonBlesserClient(name string, opts ...__ipc.BindOpt) MacaroonBlesserClientStub {
- var client __ipc.Client
+func MacaroonBlesserClient(name string, opts ...ipc.BindOpt) MacaroonBlesserClientStub {
+ var client ipc.Client
for _, opt := range opts {
- if clientOpt, ok := opt.(__ipc.Client); ok {
+ if clientOpt, ok := opt.(ipc.Client); ok {
client = clientOpt
}
}
@@ -197,18 +198,18 @@
type implMacaroonBlesserClientStub struct {
name string
- client __ipc.Client
+ client ipc.Client
}
-func (c implMacaroonBlesserClientStub) c(ctx *__context.T) __ipc.Client {
+func (c implMacaroonBlesserClientStub) c(ctx *context.T) ipc.Client {
if c.client != nil {
return c.client
}
- return __veyron2.GetClient(ctx)
+ return veyron2.GetClient(ctx)
}
-func (c implMacaroonBlesserClientStub) Bless(ctx *__context.T, i0 string, opts ...__ipc.CallOpt) (o0 security.WireBlessings, err error) {
- var call __ipc.Call
+func (c implMacaroonBlesserClientStub) Bless(ctx *context.T, i0 string, opts ...ipc.CallOpt) (o0 security.WireBlessings, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Bless", []interface{}{i0}, opts...); err != nil {
return
}
@@ -225,7 +226,7 @@
type MacaroonBlesserServerMethods interface {
// Bless uses the provided macaroon (which contains email and caveats)
// to return a blessing for the client.
- Bless(ctx __ipc.ServerContext, macaroon string) (blessing security.WireBlessings, err error)
+ Bless(ctx ipc.ServerContext, macaroon string) (blessing security.WireBlessings, err error)
}
// MacaroonBlesserServerStubMethods is the server interface containing
@@ -238,7 +239,7 @@
type MacaroonBlesserServerStub interface {
MacaroonBlesserServerStubMethods
// Describe the MacaroonBlesser interfaces.
- Describe__() []__ipc.InterfaceDesc
+ Describe__() []ipc.InterfaceDesc
}
// MacaroonBlesserServer returns a server stub for MacaroonBlesser.
@@ -250,9 +251,9 @@
}
// Initialize GlobState; always check the stub itself first, to handle the
// case where the user has the Glob method defined in their VDL source.
- if gs := __ipc.NewGlobState(stub); gs != nil {
+ if gs := ipc.NewGlobState(stub); gs != nil {
stub.gs = gs
- } else if gs := __ipc.NewGlobState(impl); gs != nil {
+ } else if gs := ipc.NewGlobState(impl); gs != nil {
stub.gs = gs
}
return stub
@@ -260,37 +261,37 @@
type implMacaroonBlesserServerStub struct {
impl MacaroonBlesserServerMethods
- gs *__ipc.GlobState
+ gs *ipc.GlobState
}
-func (s implMacaroonBlesserServerStub) Bless(ctx __ipc.ServerContext, i0 string) (security.WireBlessings, error) {
+func (s implMacaroonBlesserServerStub) Bless(ctx ipc.ServerContext, i0 string) (security.WireBlessings, error) {
return s.impl.Bless(ctx, i0)
}
-func (s implMacaroonBlesserServerStub) Globber() *__ipc.GlobState {
+func (s implMacaroonBlesserServerStub) Globber() *ipc.GlobState {
return s.gs
}
-func (s implMacaroonBlesserServerStub) Describe__() []__ipc.InterfaceDesc {
- return []__ipc.InterfaceDesc{MacaroonBlesserDesc}
+func (s implMacaroonBlesserServerStub) Describe__() []ipc.InterfaceDesc {
+ return []ipc.InterfaceDesc{MacaroonBlesserDesc}
}
// MacaroonBlesserDesc describes the MacaroonBlesser interface.
-var MacaroonBlesserDesc __ipc.InterfaceDesc = descMacaroonBlesser
+var MacaroonBlesserDesc ipc.InterfaceDesc = descMacaroonBlesser
// descMacaroonBlesser hides the desc to keep godoc clean.
-var descMacaroonBlesser = __ipc.InterfaceDesc{
+var descMacaroonBlesser = ipc.InterfaceDesc{
Name: "MacaroonBlesser",
PkgPath: "v.io/core/veyron/services/identity",
Doc: "// MacaroonBlesser returns a blessing given the provided macaroon string.",
- Methods: []__ipc.MethodDesc{
+ Methods: []ipc.MethodDesc{
{
Name: "Bless",
Doc: "// Bless uses the provided macaroon (which contains email and caveats)\n// to return a blessing for the client.",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"macaroon", ``}, // string
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"blessing", ``}, // security.WireBlessings
{"err", ``}, // error
},
diff --git a/services/identity/revocation/caveat.vdl.go b/services/identity/revocation/caveat.vdl.go
index 2990f95..be6be17 100644
--- a/services/identity/revocation/caveat.vdl.go
+++ b/services/identity/revocation/caveat.vdl.go
@@ -4,12 +4,12 @@
package revocation
import (
+ // VDL system imports
+ "v.io/core/veyron2/vdl"
+
+ // VDL user imports
"v.io/core/veyron2/security"
-
"v.io/core/veyron2/uniqueid"
-
- // The non-user imports are prefixed with "__" to prevent collisions.
- __vdl "v.io/core/veyron2/vdl"
)
// NotRevokedCaveat is used to implement revocation.
@@ -37,5 +37,5 @@
128,
0,
},
- ParamType: __vdl.TypeOf([]byte("")),
+ ParamType: vdl.TypeOf([]byte("")),
}
diff --git a/services/mgmt/device/config.vdl.go b/services/mgmt/device/config.vdl.go
index 1a14ccb..978ed96 100644
--- a/services/mgmt/device/config.vdl.go
+++ b/services/mgmt/device/config.vdl.go
@@ -4,10 +4,10 @@
package device
import (
- // The non-user imports are prefixed with "__" to prevent collisions.
- __veyron2 "v.io/core/veyron2"
- __context "v.io/core/veyron2/context"
- __ipc "v.io/core/veyron2/ipc"
+ // VDL system imports
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
)
// ConfigClientMethods is the client interface
@@ -16,20 +16,20 @@
// Config is an RPC API to the config service.
type ConfigClientMethods interface {
// Set sets the value for key.
- Set(ctx *__context.T, key string, value string, opts ...__ipc.CallOpt) error
+ Set(ctx *context.T, key string, value string, opts ...ipc.CallOpt) error
}
// ConfigClientStub adds universal methods to ConfigClientMethods.
type ConfigClientStub interface {
ConfigClientMethods
- __ipc.UniversalServiceMethods
+ ipc.UniversalServiceMethods
}
// ConfigClient returns a client stub for Config.
-func ConfigClient(name string, opts ...__ipc.BindOpt) ConfigClientStub {
- var client __ipc.Client
+func ConfigClient(name string, opts ...ipc.BindOpt) ConfigClientStub {
+ var client ipc.Client
for _, opt := range opts {
- if clientOpt, ok := opt.(__ipc.Client); ok {
+ if clientOpt, ok := opt.(ipc.Client); ok {
client = clientOpt
}
}
@@ -38,18 +38,18 @@
type implConfigClientStub struct {
name string
- client __ipc.Client
+ client ipc.Client
}
-func (c implConfigClientStub) c(ctx *__context.T) __ipc.Client {
+func (c implConfigClientStub) c(ctx *context.T) ipc.Client {
if c.client != nil {
return c.client
}
- return __veyron2.GetClient(ctx)
+ return veyron2.GetClient(ctx)
}
-func (c implConfigClientStub) Set(ctx *__context.T, i0 string, i1 string, opts ...__ipc.CallOpt) (err error) {
- var call __ipc.Call
+func (c implConfigClientStub) Set(ctx *context.T, i0 string, i1 string, opts ...ipc.CallOpt) (err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Set", []interface{}{i0, i1}, opts...); err != nil {
return
}
@@ -65,7 +65,7 @@
// Config is an RPC API to the config service.
type ConfigServerMethods interface {
// Set sets the value for key.
- Set(ctx __ipc.ServerContext, key string, value string) error
+ Set(ctx ipc.ServerContext, key string, value string) error
}
// ConfigServerStubMethods is the server interface containing
@@ -78,7 +78,7 @@
type ConfigServerStub interface {
ConfigServerStubMethods
// Describe the Config interfaces.
- Describe__() []__ipc.InterfaceDesc
+ Describe__() []ipc.InterfaceDesc
}
// ConfigServer returns a server stub for Config.
@@ -90,9 +90,9 @@
}
// Initialize GlobState; always check the stub itself first, to handle the
// case where the user has the Glob method defined in their VDL source.
- if gs := __ipc.NewGlobState(stub); gs != nil {
+ if gs := ipc.NewGlobState(stub); gs != nil {
stub.gs = gs
- } else if gs := __ipc.NewGlobState(impl); gs != nil {
+ } else if gs := ipc.NewGlobState(impl); gs != nil {
stub.gs = gs
}
return stub
@@ -100,38 +100,38 @@
type implConfigServerStub struct {
impl ConfigServerMethods
- gs *__ipc.GlobState
+ gs *ipc.GlobState
}
-func (s implConfigServerStub) Set(ctx __ipc.ServerContext, i0 string, i1 string) error {
+func (s implConfigServerStub) Set(ctx ipc.ServerContext, i0 string, i1 string) error {
return s.impl.Set(ctx, i0, i1)
}
-func (s implConfigServerStub) Globber() *__ipc.GlobState {
+func (s implConfigServerStub) Globber() *ipc.GlobState {
return s.gs
}
-func (s implConfigServerStub) Describe__() []__ipc.InterfaceDesc {
- return []__ipc.InterfaceDesc{ConfigDesc}
+func (s implConfigServerStub) Describe__() []ipc.InterfaceDesc {
+ return []ipc.InterfaceDesc{ConfigDesc}
}
// ConfigDesc describes the Config interface.
-var ConfigDesc __ipc.InterfaceDesc = descConfig
+var ConfigDesc ipc.InterfaceDesc = descConfig
// descConfig hides the desc to keep godoc clean.
-var descConfig = __ipc.InterfaceDesc{
+var descConfig = ipc.InterfaceDesc{
Name: "Config",
PkgPath: "v.io/core/veyron/services/mgmt/device",
Doc: "// Config is an RPC API to the config service.",
- Methods: []__ipc.MethodDesc{
+ Methods: []ipc.MethodDesc{
{
Name: "Set",
Doc: "// Set sets the value for key.",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"key", ``}, // string
{"value", ``}, // string
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
},
diff --git a/services/mgmt/profile/profile.vdl.go b/services/mgmt/profile/profile.vdl.go
index 6db310d..331db64 100644
--- a/services/mgmt/profile/profile.vdl.go
+++ b/services/mgmt/profile/profile.vdl.go
@@ -6,10 +6,11 @@
package profile
import (
- "v.io/core/veyron2/services/mgmt/build"
+ // VDL system imports
+ "v.io/core/veyron2/vdl"
- // The non-user imports are prefixed with "__" to prevent collisions.
- __vdl "v.io/core/veyron2/vdl"
+ // VDL user imports
+ "v.io/core/veyron2/services/mgmt/build"
)
// Library describes a shared library that applications may use.
@@ -51,6 +52,6 @@
}
func init() {
- __vdl.Register(Library{})
- __vdl.Register(Specification{})
+ vdl.Register(Library{})
+ vdl.Register(Specification{})
}
diff --git a/services/mgmt/repository/repository.vdl.go b/services/mgmt/repository/repository.vdl.go
index f90a688..47be35b 100644
--- a/services/mgmt/repository/repository.vdl.go
+++ b/services/mgmt/repository/repository.vdl.go
@@ -6,21 +6,18 @@
package repository
import (
+ // VDL system imports
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/vdl"
+
+ // VDL user imports
"v.io/core/veyron/services/mgmt/profile"
-
"v.io/core/veyron2/services/mgmt/application"
-
"v.io/core/veyron2/services/mgmt/repository"
-
"v.io/core/veyron2/services/security/access"
-
"v.io/core/veyron2/services/security/access/object"
-
- // The non-user imports are prefixed with "__" to prevent collisions.
- __veyron2 "v.io/core/veyron2"
- __context "v.io/core/veyron2/context"
- __ipc "v.io/core/veyron2/ipc"
- __vdl "v.io/core/veyron2/vdl"
)
// ApplicationClientMethods is the client interface
@@ -44,7 +41,7 @@
// Put adds the given tuple of application version (specified
// through the object name suffix) and application envelope to all
// of the given application profiles.
- Put(ctx *__context.T, Profiles []string, Envelope application.Envelope, opts ...__ipc.CallOpt) error
+ Put(ctx *context.T, Profiles []string, Envelope application.Envelope, opts ...ipc.CallOpt) error
// Remove removes the application envelope for the given profile
// name and application version (specified through the object name
// suffix). If no version is specified as part of the suffix, the
@@ -52,20 +49,20 @@
//
// TODO(jsimsa): Add support for using "*" to specify all profiles
// when Matt implements Globing (or Ken implements querying).
- Remove(ctx *__context.T, Profile string, opts ...__ipc.CallOpt) error
+ Remove(ctx *context.T, Profile string, opts ...ipc.CallOpt) error
}
// ApplicationClientStub adds universal methods to ApplicationClientMethods.
type ApplicationClientStub interface {
ApplicationClientMethods
- __ipc.UniversalServiceMethods
+ ipc.UniversalServiceMethods
}
// ApplicationClient returns a client stub for Application.
-func ApplicationClient(name string, opts ...__ipc.BindOpt) ApplicationClientStub {
- var client __ipc.Client
+func ApplicationClient(name string, opts ...ipc.BindOpt) ApplicationClientStub {
+ var client ipc.Client
for _, opt := range opts {
- if clientOpt, ok := opt.(__ipc.Client); ok {
+ if clientOpt, ok := opt.(ipc.Client); ok {
client = clientOpt
}
}
@@ -74,20 +71,20 @@
type implApplicationClientStub struct {
name string
- client __ipc.Client
+ client ipc.Client
repository.ApplicationClientStub
}
-func (c implApplicationClientStub) c(ctx *__context.T) __ipc.Client {
+func (c implApplicationClientStub) c(ctx *context.T) ipc.Client {
if c.client != nil {
return c.client
}
- return __veyron2.GetClient(ctx)
+ return veyron2.GetClient(ctx)
}
-func (c implApplicationClientStub) Put(ctx *__context.T, i0 []string, i1 application.Envelope, opts ...__ipc.CallOpt) (err error) {
- var call __ipc.Call
+func (c implApplicationClientStub) Put(ctx *context.T, i0 []string, i1 application.Envelope, opts ...ipc.CallOpt) (err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Put", []interface{}{i0, i1}, opts...); err != nil {
return
}
@@ -97,8 +94,8 @@
return
}
-func (c implApplicationClientStub) Remove(ctx *__context.T, i0 string, opts ...__ipc.CallOpt) (err error) {
- var call __ipc.Call
+func (c implApplicationClientStub) Remove(ctx *context.T, i0 string, opts ...ipc.CallOpt) (err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Remove", []interface{}{i0}, opts...); err != nil {
return
}
@@ -129,7 +126,7 @@
// Put adds the given tuple of application version (specified
// through the object name suffix) and application envelope to all
// of the given application profiles.
- Put(ctx __ipc.ServerContext, Profiles []string, Envelope application.Envelope) error
+ Put(ctx ipc.ServerContext, Profiles []string, Envelope application.Envelope) error
// Remove removes the application envelope for the given profile
// name and application version (specified through the object name
// suffix). If no version is specified as part of the suffix, the
@@ -137,7 +134,7 @@
//
// TODO(jsimsa): Add support for using "*" to specify all profiles
// when Matt implements Globing (or Ken implements querying).
- Remove(ctx __ipc.ServerContext, Profile string) error
+ Remove(ctx ipc.ServerContext, Profile string) error
}
// ApplicationServerStubMethods is the server interface containing
@@ -150,7 +147,7 @@
type ApplicationServerStub interface {
ApplicationServerStubMethods
// Describe the Application interfaces.
- Describe__() []__ipc.InterfaceDesc
+ Describe__() []ipc.InterfaceDesc
}
// ApplicationServer returns a server stub for Application.
@@ -163,9 +160,9 @@
}
// Initialize GlobState; always check the stub itself first, to handle the
// case where the user has the Glob method defined in their VDL source.
- if gs := __ipc.NewGlobState(stub); gs != nil {
+ if gs := ipc.NewGlobState(stub); gs != nil {
stub.gs = gs
- } else if gs := __ipc.NewGlobState(impl); gs != nil {
+ } else if gs := ipc.NewGlobState(impl); gs != nil {
stub.gs = gs
}
return stub
@@ -174,59 +171,59 @@
type implApplicationServerStub struct {
impl ApplicationServerMethods
repository.ApplicationServerStub
- gs *__ipc.GlobState
+ gs *ipc.GlobState
}
-func (s implApplicationServerStub) Put(ctx __ipc.ServerContext, i0 []string, i1 application.Envelope) error {
+func (s implApplicationServerStub) Put(ctx ipc.ServerContext, i0 []string, i1 application.Envelope) error {
return s.impl.Put(ctx, i0, i1)
}
-func (s implApplicationServerStub) Remove(ctx __ipc.ServerContext, i0 string) error {
+func (s implApplicationServerStub) Remove(ctx ipc.ServerContext, i0 string) error {
return s.impl.Remove(ctx, i0)
}
-func (s implApplicationServerStub) Globber() *__ipc.GlobState {
+func (s implApplicationServerStub) Globber() *ipc.GlobState {
return s.gs
}
-func (s implApplicationServerStub) Describe__() []__ipc.InterfaceDesc {
- return []__ipc.InterfaceDesc{ApplicationDesc, repository.ApplicationDesc, object.ObjectDesc}
+func (s implApplicationServerStub) Describe__() []ipc.InterfaceDesc {
+ return []ipc.InterfaceDesc{ApplicationDesc, repository.ApplicationDesc, object.ObjectDesc}
}
// ApplicationDesc describes the Application interface.
-var ApplicationDesc __ipc.InterfaceDesc = descApplication
+var ApplicationDesc ipc.InterfaceDesc = descApplication
// descApplication hides the desc to keep godoc clean.
-var descApplication = __ipc.InterfaceDesc{
+var descApplication = ipc.InterfaceDesc{
Name: "Application",
PkgPath: "v.io/core/veyron/services/mgmt/repository",
Doc: "// Application describes an application repository internally. Besides\n// the public Application interface, it allows to add and remove\n// application envelopes.",
- Embeds: []__ipc.EmbedDesc{
+ Embeds: []ipc.EmbedDesc{
{"Application", "v.io/core/veyron2/services/mgmt/repository", "// Application provides access to application envelopes. An\n// application envelope is identified by an application name and an\n// application version, which are specified through the object name,\n// and a profile name, which is specified using a method argument.\n//\n// Example:\n// /apps/search/v1.Match([]string{\"base\", \"media\"})\n// returns an application envelope that can be used for downloading\n// and executing the \"search\" application, version \"v1\", runnable\n// on either the \"base\" or \"media\" profile."},
},
- Methods: []__ipc.MethodDesc{
+ Methods: []ipc.MethodDesc{
{
Name: "Put",
Doc: "// Put adds the given tuple of application version (specified\n// through the object name suffix) and application envelope to all\n// of the given application profiles.",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"Profiles", ``}, // []string
{"Envelope", ``}, // application.Envelope
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
- Tags: []__vdl.AnyRep{access.Tag("Write")},
+ Tags: []vdl.AnyRep{access.Tag("Write")},
},
{
Name: "Remove",
Doc: "// Remove removes the application envelope for the given profile\n// name and application version (specified through the object name\n// suffix). If no version is specified as part of the suffix, the\n// method removes all versions for the given profile.\n//\n// TODO(jsimsa): Add support for using \"*\" to specify all profiles\n// when Matt implements Globing (or Ken implements querying).",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"Profile", ``}, // string
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
- Tags: []__vdl.AnyRep{access.Tag("Write")},
+ Tags: []vdl.AnyRep{access.Tag("Write")},
},
},
}
@@ -244,26 +241,26 @@
repository.ProfileClientMethods
// Specification returns the profile specification for the profile
// identified through the object name suffix.
- Specification(*__context.T, ...__ipc.CallOpt) (profile.Specification, error)
+ Specification(*context.T, ...ipc.CallOpt) (profile.Specification, error)
// Put sets the profile specification for the profile identified
// through the object name suffix.
- Put(ctx *__context.T, Specification profile.Specification, opts ...__ipc.CallOpt) error
+ Put(ctx *context.T, Specification profile.Specification, opts ...ipc.CallOpt) error
// Remove removes the profile specification for the profile
// identified through the object name suffix.
- Remove(*__context.T, ...__ipc.CallOpt) error
+ Remove(*context.T, ...ipc.CallOpt) error
}
// ProfileClientStub adds universal methods to ProfileClientMethods.
type ProfileClientStub interface {
ProfileClientMethods
- __ipc.UniversalServiceMethods
+ ipc.UniversalServiceMethods
}
// ProfileClient returns a client stub for Profile.
-func ProfileClient(name string, opts ...__ipc.BindOpt) ProfileClientStub {
- var client __ipc.Client
+func ProfileClient(name string, opts ...ipc.BindOpt) ProfileClientStub {
+ var client ipc.Client
for _, opt := range opts {
- if clientOpt, ok := opt.(__ipc.Client); ok {
+ if clientOpt, ok := opt.(ipc.Client); ok {
client = clientOpt
}
}
@@ -272,20 +269,20 @@
type implProfileClientStub struct {
name string
- client __ipc.Client
+ client ipc.Client
repository.ProfileClientStub
}
-func (c implProfileClientStub) c(ctx *__context.T) __ipc.Client {
+func (c implProfileClientStub) c(ctx *context.T) ipc.Client {
if c.client != nil {
return c.client
}
- return __veyron2.GetClient(ctx)
+ return veyron2.GetClient(ctx)
}
-func (c implProfileClientStub) Specification(ctx *__context.T, opts ...__ipc.CallOpt) (o0 profile.Specification, err error) {
- var call __ipc.Call
+func (c implProfileClientStub) Specification(ctx *context.T, opts ...ipc.CallOpt) (o0 profile.Specification, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Specification", nil, opts...); err != nil {
return
}
@@ -295,8 +292,8 @@
return
}
-func (c implProfileClientStub) Put(ctx *__context.T, i0 profile.Specification, opts ...__ipc.CallOpt) (err error) {
- var call __ipc.Call
+func (c implProfileClientStub) Put(ctx *context.T, i0 profile.Specification, opts ...ipc.CallOpt) (err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Put", []interface{}{i0}, opts...); err != nil {
return
}
@@ -306,8 +303,8 @@
return
}
-func (c implProfileClientStub) Remove(ctx *__context.T, opts ...__ipc.CallOpt) (err error) {
- var call __ipc.Call
+func (c implProfileClientStub) Remove(ctx *context.T, opts ...ipc.CallOpt) (err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Remove", nil, opts...); err != nil {
return
}
@@ -330,13 +327,13 @@
repository.ProfileServerMethods
// Specification returns the profile specification for the profile
// identified through the object name suffix.
- Specification(__ipc.ServerContext) (profile.Specification, error)
+ Specification(ipc.ServerContext) (profile.Specification, error)
// Put sets the profile specification for the profile identified
// through the object name suffix.
- Put(ctx __ipc.ServerContext, Specification profile.Specification) error
+ Put(ctx ipc.ServerContext, Specification profile.Specification) error
// Remove removes the profile specification for the profile
// identified through the object name suffix.
- Remove(__ipc.ServerContext) error
+ Remove(ipc.ServerContext) error
}
// ProfileServerStubMethods is the server interface containing
@@ -349,7 +346,7 @@
type ProfileServerStub interface {
ProfileServerStubMethods
// Describe the Profile interfaces.
- Describe__() []__ipc.InterfaceDesc
+ Describe__() []ipc.InterfaceDesc
}
// ProfileServer returns a server stub for Profile.
@@ -362,9 +359,9 @@
}
// Initialize GlobState; always check the stub itself first, to handle the
// case where the user has the Glob method defined in their VDL source.
- if gs := __ipc.NewGlobState(stub); gs != nil {
+ if gs := ipc.NewGlobState(stub); gs != nil {
stub.gs = gs
- } else if gs := __ipc.NewGlobState(impl); gs != nil {
+ } else if gs := ipc.NewGlobState(impl); gs != nil {
stub.gs = gs
}
return stub
@@ -373,68 +370,68 @@
type implProfileServerStub struct {
impl ProfileServerMethods
repository.ProfileServerStub
- gs *__ipc.GlobState
+ gs *ipc.GlobState
}
-func (s implProfileServerStub) Specification(ctx __ipc.ServerContext) (profile.Specification, error) {
+func (s implProfileServerStub) Specification(ctx ipc.ServerContext) (profile.Specification, error) {
return s.impl.Specification(ctx)
}
-func (s implProfileServerStub) Put(ctx __ipc.ServerContext, i0 profile.Specification) error {
+func (s implProfileServerStub) Put(ctx ipc.ServerContext, i0 profile.Specification) error {
return s.impl.Put(ctx, i0)
}
-func (s implProfileServerStub) Remove(ctx __ipc.ServerContext) error {
+func (s implProfileServerStub) Remove(ctx ipc.ServerContext) error {
return s.impl.Remove(ctx)
}
-func (s implProfileServerStub) Globber() *__ipc.GlobState {
+func (s implProfileServerStub) Globber() *ipc.GlobState {
return s.gs
}
-func (s implProfileServerStub) Describe__() []__ipc.InterfaceDesc {
- return []__ipc.InterfaceDesc{ProfileDesc, repository.ProfileDesc}
+func (s implProfileServerStub) Describe__() []ipc.InterfaceDesc {
+ return []ipc.InterfaceDesc{ProfileDesc, repository.ProfileDesc}
}
// ProfileDesc describes the Profile interface.
-var ProfileDesc __ipc.InterfaceDesc = descProfile
+var ProfileDesc ipc.InterfaceDesc = descProfile
// descProfile hides the desc to keep godoc clean.
-var descProfile = __ipc.InterfaceDesc{
+var descProfile = ipc.InterfaceDesc{
Name: "Profile",
PkgPath: "v.io/core/veyron/services/mgmt/repository",
Doc: "// Profile describes a profile internally. Besides the public Profile\n// interface, it allows to add and remove profile specifications.",
- Embeds: []__ipc.EmbedDesc{
+ Embeds: []ipc.EmbedDesc{
{"Profile", "v.io/core/veyron2/services/mgmt/repository", "// Profile abstracts a device's ability to run binaries, and hides\n// specifics such as the operating system, hardware architecture, and\n// the set of installed libraries. Profiles describe binaries and\n// devices, and are used to match them."},
},
- Methods: []__ipc.MethodDesc{
+ Methods: []ipc.MethodDesc{
{
Name: "Specification",
Doc: "// Specification returns the profile specification for the profile\n// identified through the object name suffix.",
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // profile.Specification
{"", ``}, // error
},
- Tags: []__vdl.AnyRep{access.Tag("Read")},
+ Tags: []vdl.AnyRep{access.Tag("Read")},
},
{
Name: "Put",
Doc: "// Put sets the profile specification for the profile identified\n// through the object name suffix.",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"Specification", ``}, // profile.Specification
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
- Tags: []__vdl.AnyRep{access.Tag("Write")},
+ Tags: []vdl.AnyRep{access.Tag("Write")},
},
{
Name: "Remove",
Doc: "// Remove removes the profile specification for the profile\n// identified through the object name suffix.",
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
- Tags: []__vdl.AnyRep{access.Tag("Write")},
+ Tags: []vdl.AnyRep{access.Tag("Write")},
},
},
}
diff --git a/services/mgmt/stats/types.vdl.go b/services/mgmt/stats/types.vdl.go
index 84d8bad..29422e8 100644
--- a/services/mgmt/stats/types.vdl.go
+++ b/services/mgmt/stats/types.vdl.go
@@ -5,8 +5,8 @@
package stats
import (
- // The non-user imports are prefixed with "__" to prevent collisions.
- __vdl "v.io/core/veyron2/vdl"
+ // VDL system imports
+ "v.io/core/veyron2/vdl"
)
// HistogramValue is the value of Histogram objects.
@@ -42,6 +42,6 @@
}
func init() {
- __vdl.Register(HistogramValue{})
- __vdl.Register(HistogramBucket{})
+ vdl.Register(HistogramValue{})
+ vdl.Register(HistogramBucket{})
}
diff --git a/services/mounttable/lib/collection_test_interface.vdl.go b/services/mounttable/lib/collection_test_interface.vdl.go
index 612f212..61be70a 100644
--- a/services/mounttable/lib/collection_test_interface.vdl.go
+++ b/services/mounttable/lib/collection_test_interface.vdl.go
@@ -4,10 +4,10 @@
package mounttable
import (
- // The non-user imports are prefixed with "__" to prevent collisions.
- __veyron2 "v.io/core/veyron2"
- __context "v.io/core/veyron2/context"
- __ipc "v.io/core/veyron2/ipc"
+ // VDL system imports
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
)
// CollectionClientMethods is the client interface
@@ -17,23 +17,23 @@
// an entry exists, if Overwrite is true, then the binding is replaced,
// otherwise the call fails with an error. The Val must be no larger than
// MaxSize bytes.
- Export(ctx *__context.T, Val string, Overwrite bool, opts ...__ipc.CallOpt) error
+ Export(ctx *context.T, Val string, Overwrite bool, opts ...ipc.CallOpt) error
// Lookup retrieves the value associated with a name. Returns an error if
// there is no such binding.
- Lookup(*__context.T, ...__ipc.CallOpt) ([]byte, error)
+ Lookup(*context.T, ...ipc.CallOpt) ([]byte, error)
}
// CollectionClientStub adds universal methods to CollectionClientMethods.
type CollectionClientStub interface {
CollectionClientMethods
- __ipc.UniversalServiceMethods
+ ipc.UniversalServiceMethods
}
// CollectionClient returns a client stub for Collection.
-func CollectionClient(name string, opts ...__ipc.BindOpt) CollectionClientStub {
- var client __ipc.Client
+func CollectionClient(name string, opts ...ipc.BindOpt) CollectionClientStub {
+ var client ipc.Client
for _, opt := range opts {
- if clientOpt, ok := opt.(__ipc.Client); ok {
+ if clientOpt, ok := opt.(ipc.Client); ok {
client = clientOpt
}
}
@@ -42,18 +42,18 @@
type implCollectionClientStub struct {
name string
- client __ipc.Client
+ client ipc.Client
}
-func (c implCollectionClientStub) c(ctx *__context.T) __ipc.Client {
+func (c implCollectionClientStub) c(ctx *context.T) ipc.Client {
if c.client != nil {
return c.client
}
- return __veyron2.GetClient(ctx)
+ return veyron2.GetClient(ctx)
}
-func (c implCollectionClientStub) Export(ctx *__context.T, i0 string, i1 bool, opts ...__ipc.CallOpt) (err error) {
- var call __ipc.Call
+func (c implCollectionClientStub) Export(ctx *context.T, i0 string, i1 bool, opts ...ipc.CallOpt) (err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Export", []interface{}{i0, i1}, opts...); err != nil {
return
}
@@ -63,8 +63,8 @@
return
}
-func (c implCollectionClientStub) Lookup(ctx *__context.T, opts ...__ipc.CallOpt) (o0 []byte, err error) {
- var call __ipc.Call
+func (c implCollectionClientStub) Lookup(ctx *context.T, opts ...ipc.CallOpt) (o0 []byte, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Lookup", nil, opts...); err != nil {
return
}
@@ -81,10 +81,10 @@
// an entry exists, if Overwrite is true, then the binding is replaced,
// otherwise the call fails with an error. The Val must be no larger than
// MaxSize bytes.
- Export(ctx __ipc.ServerContext, Val string, Overwrite bool) error
+ Export(ctx ipc.ServerContext, Val string, Overwrite bool) error
// Lookup retrieves the value associated with a name. Returns an error if
// there is no such binding.
- Lookup(__ipc.ServerContext) ([]byte, error)
+ Lookup(ipc.ServerContext) ([]byte, error)
}
// CollectionServerStubMethods is the server interface containing
@@ -97,7 +97,7 @@
type CollectionServerStub interface {
CollectionServerStubMethods
// Describe the Collection interfaces.
- Describe__() []__ipc.InterfaceDesc
+ Describe__() []ipc.InterfaceDesc
}
// CollectionServer returns a server stub for Collection.
@@ -109,9 +109,9 @@
}
// Initialize GlobState; always check the stub itself first, to handle the
// case where the user has the Glob method defined in their VDL source.
- if gs := __ipc.NewGlobState(stub); gs != nil {
+ if gs := ipc.NewGlobState(stub); gs != nil {
stub.gs = gs
- } else if gs := __ipc.NewGlobState(impl); gs != nil {
+ } else if gs := ipc.NewGlobState(impl); gs != nil {
stub.gs = gs
}
return stub
@@ -119,48 +119,48 @@
type implCollectionServerStub struct {
impl CollectionServerMethods
- gs *__ipc.GlobState
+ gs *ipc.GlobState
}
-func (s implCollectionServerStub) Export(ctx __ipc.ServerContext, i0 string, i1 bool) error {
+func (s implCollectionServerStub) Export(ctx ipc.ServerContext, i0 string, i1 bool) error {
return s.impl.Export(ctx, i0, i1)
}
-func (s implCollectionServerStub) Lookup(ctx __ipc.ServerContext) ([]byte, error) {
+func (s implCollectionServerStub) Lookup(ctx ipc.ServerContext) ([]byte, error) {
return s.impl.Lookup(ctx)
}
-func (s implCollectionServerStub) Globber() *__ipc.GlobState {
+func (s implCollectionServerStub) Globber() *ipc.GlobState {
return s.gs
}
-func (s implCollectionServerStub) Describe__() []__ipc.InterfaceDesc {
- return []__ipc.InterfaceDesc{CollectionDesc}
+func (s implCollectionServerStub) Describe__() []ipc.InterfaceDesc {
+ return []ipc.InterfaceDesc{CollectionDesc}
}
// CollectionDesc describes the Collection interface.
-var CollectionDesc __ipc.InterfaceDesc = descCollection
+var CollectionDesc ipc.InterfaceDesc = descCollection
// descCollection hides the desc to keep godoc clean.
-var descCollection = __ipc.InterfaceDesc{
+var descCollection = ipc.InterfaceDesc{
Name: "Collection",
PkgPath: "v.io/core/veyron/services/mounttable/lib",
- Methods: []__ipc.MethodDesc{
+ Methods: []ipc.MethodDesc{
{
Name: "Export",
Doc: "// Export sets the value for a name. Overwrite controls the behavior when\n// an entry exists, if Overwrite is true, then the binding is replaced,\n// otherwise the call fails with an error. The Val must be no larger than\n// MaxSize bytes.",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"Val", ``}, // string
{"Overwrite", ``}, // bool
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
},
{
Name: "Lookup",
Doc: "// Lookup retrieves the value associated with a name. Returns an error if\n// there is no such binding.",
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // []byte
{"", ``}, // error
},
diff --git a/services/security/discharger.vdl.go b/services/security/discharger.vdl.go
index f086448..9e266fb 100644
--- a/services/security/discharger.vdl.go
+++ b/services/security/discharger.vdl.go
@@ -4,13 +4,14 @@
package security
import (
- "v.io/core/veyron2/security"
+ // VDL system imports
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/vdl"
- // The non-user imports are prefixed with "__" to prevent collisions.
- __veyron2 "v.io/core/veyron2"
- __context "v.io/core/veyron2/context"
- __ipc "v.io/core/veyron2/ipc"
- __vdl "v.io/core/veyron2/vdl"
+ // VDL user imports
+ "v.io/core/veyron2/security"
)
// DischargerClientMethods is the client interface
@@ -26,20 +27,20 @@
// respectively. (not enforced here because vdl does not know these types)
// TODO(ataly,ashankar): The type of Caveat should become security.Caveat and
// we have to figure out an alternative to any for the return Discharge.
- Discharge(ctx *__context.T, Caveat __vdl.AnyRep, Impetus security.DischargeImpetus, opts ...__ipc.CallOpt) (Discharge __vdl.AnyRep, err error)
+ Discharge(ctx *context.T, Caveat vdl.AnyRep, Impetus security.DischargeImpetus, opts ...ipc.CallOpt) (Discharge vdl.AnyRep, err error)
}
// DischargerClientStub adds universal methods to DischargerClientMethods.
type DischargerClientStub interface {
DischargerClientMethods
- __ipc.UniversalServiceMethods
+ ipc.UniversalServiceMethods
}
// DischargerClient returns a client stub for Discharger.
-func DischargerClient(name string, opts ...__ipc.BindOpt) DischargerClientStub {
- var client __ipc.Client
+func DischargerClient(name string, opts ...ipc.BindOpt) DischargerClientStub {
+ var client ipc.Client
for _, opt := range opts {
- if clientOpt, ok := opt.(__ipc.Client); ok {
+ if clientOpt, ok := opt.(ipc.Client); ok {
client = clientOpt
}
}
@@ -48,18 +49,18 @@
type implDischargerClientStub struct {
name string
- client __ipc.Client
+ client ipc.Client
}
-func (c implDischargerClientStub) c(ctx *__context.T) __ipc.Client {
+func (c implDischargerClientStub) c(ctx *context.T) ipc.Client {
if c.client != nil {
return c.client
}
- return __veyron2.GetClient(ctx)
+ return veyron2.GetClient(ctx)
}
-func (c implDischargerClientStub) Discharge(ctx *__context.T, i0 __vdl.AnyRep, i1 security.DischargeImpetus, opts ...__ipc.CallOpt) (o0 __vdl.AnyRep, err error) {
- var call __ipc.Call
+func (c implDischargerClientStub) Discharge(ctx *context.T, i0 vdl.AnyRep, i1 security.DischargeImpetus, opts ...ipc.CallOpt) (o0 vdl.AnyRep, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "Discharge", []interface{}{i0, i1}, opts...); err != nil {
return
}
@@ -82,7 +83,7 @@
// respectively. (not enforced here because vdl does not know these types)
// TODO(ataly,ashankar): The type of Caveat should become security.Caveat and
// we have to figure out an alternative to any for the return Discharge.
- Discharge(ctx __ipc.ServerContext, Caveat __vdl.AnyRep, Impetus security.DischargeImpetus) (Discharge __vdl.AnyRep, err error)
+ Discharge(ctx ipc.ServerContext, Caveat vdl.AnyRep, Impetus security.DischargeImpetus) (Discharge vdl.AnyRep, err error)
}
// DischargerServerStubMethods is the server interface containing
@@ -95,7 +96,7 @@
type DischargerServerStub interface {
DischargerServerStubMethods
// Describe the Discharger interfaces.
- Describe__() []__ipc.InterfaceDesc
+ Describe__() []ipc.InterfaceDesc
}
// DischargerServer returns a server stub for Discharger.
@@ -107,9 +108,9 @@
}
// Initialize GlobState; always check the stub itself first, to handle the
// case where the user has the Glob method defined in their VDL source.
- if gs := __ipc.NewGlobState(stub); gs != nil {
+ if gs := ipc.NewGlobState(stub); gs != nil {
stub.gs = gs
- } else if gs := __ipc.NewGlobState(impl); gs != nil {
+ } else if gs := ipc.NewGlobState(impl); gs != nil {
stub.gs = gs
}
return stub
@@ -117,39 +118,39 @@
type implDischargerServerStub struct {
impl DischargerServerMethods
- gs *__ipc.GlobState
+ gs *ipc.GlobState
}
-func (s implDischargerServerStub) Discharge(ctx __ipc.ServerContext, i0 __vdl.AnyRep, i1 security.DischargeImpetus) (__vdl.AnyRep, error) {
+func (s implDischargerServerStub) Discharge(ctx ipc.ServerContext, i0 vdl.AnyRep, i1 security.DischargeImpetus) (vdl.AnyRep, error) {
return s.impl.Discharge(ctx, i0, i1)
}
-func (s implDischargerServerStub) Globber() *__ipc.GlobState {
+func (s implDischargerServerStub) Globber() *ipc.GlobState {
return s.gs
}
-func (s implDischargerServerStub) Describe__() []__ipc.InterfaceDesc {
- return []__ipc.InterfaceDesc{DischargerDesc}
+func (s implDischargerServerStub) Describe__() []ipc.InterfaceDesc {
+ return []ipc.InterfaceDesc{DischargerDesc}
}
// DischargerDesc describes the Discharger interface.
-var DischargerDesc __ipc.InterfaceDesc = descDischarger
+var DischargerDesc ipc.InterfaceDesc = descDischarger
// descDischarger hides the desc to keep godoc clean.
-var descDischarger = __ipc.InterfaceDesc{
+var descDischarger = ipc.InterfaceDesc{
Name: "Discharger",
PkgPath: "v.io/core/veyron/services/security",
Doc: "// Discharger is the interface for obtaining discharges for ThirdPartyCaveats.",
- Methods: []__ipc.MethodDesc{
+ Methods: []ipc.MethodDesc{
{
Name: "Discharge",
Doc: "// Discharge is called by a principal that holds a blessing with a third\n// party caveat and seeks to get a discharge that proves the fulfillment of\n// this caveat.\n//\n// Caveat and Discharge are of type ThirdPartyCaveat and Discharge\n// respectively. (not enforced here because vdl does not know these types)\n// TODO(ataly,ashankar): The type of Caveat should become security.Caveat and\n// we have to figure out an alternative to any for the return Discharge.",
- InArgs: []__ipc.ArgDesc{
- {"Caveat", ``}, // __vdl.AnyRep
+ InArgs: []ipc.ArgDesc{
+ {"Caveat", ``}, // vdl.AnyRep
{"Impetus", ``}, // security.DischargeImpetus
},
- OutArgs: []__ipc.ArgDesc{
- {"Discharge", ``}, // __vdl.AnyRep
+ OutArgs: []ipc.ArgDesc{
+ {"Discharge", ``}, // vdl.AnyRep
{"err", ``}, // error
},
},
diff --git a/tools/vrpc/test_base/test_base.vdl.go b/tools/vrpc/test_base/test_base.vdl.go
index 11d7c40..e49f151 100644
--- a/tools/vrpc/test_base/test_base.vdl.go
+++ b/tools/vrpc/test_base/test_base.vdl.go
@@ -4,12 +4,12 @@
package test_base
import (
- // The non-user imports are prefixed with "__" to prevent collisions.
- __io "io"
- __veyron2 "v.io/core/veyron2"
- __context "v.io/core/veyron2/context"
- __ipc "v.io/core/veyron2/ipc"
- __vdl "v.io/core/veyron2/vdl"
+ // VDL system imports
+ "io"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/vdl"
)
type Struct struct {
@@ -30,8 +30,8 @@
}
func init() {
- __vdl.Register(Struct{})
- __vdl.Register(Array2Int{})
+ vdl.Register(Struct{})
+ vdl.Register(Array2Int{})
}
// TypeTesterClientMethods is the client interface
@@ -41,39 +41,39 @@
// test Signature output, which sorts methods alphabetically.
type TypeTesterClientMethods interface {
// Methods to test support for primitive types.
- EchoBool(ctx *__context.T, I1 bool, opts ...__ipc.CallOpt) (O1 bool, err error)
- EchoFloat32(ctx *__context.T, I1 float32, opts ...__ipc.CallOpt) (O1 float32, err error)
- EchoFloat64(ctx *__context.T, I1 float64, opts ...__ipc.CallOpt) (O1 float64, err error)
- EchoInt32(ctx *__context.T, I1 int32, opts ...__ipc.CallOpt) (O1 int32, err error)
- EchoInt64(ctx *__context.T, I1 int64, opts ...__ipc.CallOpt) (O1 int64, err error)
- EchoString(ctx *__context.T, I1 string, opts ...__ipc.CallOpt) (O1 string, err error)
- EchoByte(ctx *__context.T, I1 byte, opts ...__ipc.CallOpt) (O1 byte, err error)
- EchoUint32(ctx *__context.T, I1 uint32, opts ...__ipc.CallOpt) (O1 uint32, err error)
- EchoUint64(ctx *__context.T, I1 uint64, opts ...__ipc.CallOpt) (O1 uint64, err error)
+ EchoBool(ctx *context.T, I1 bool, opts ...ipc.CallOpt) (O1 bool, err error)
+ EchoFloat32(ctx *context.T, I1 float32, opts ...ipc.CallOpt) (O1 float32, err error)
+ EchoFloat64(ctx *context.T, I1 float64, opts ...ipc.CallOpt) (O1 float64, err error)
+ EchoInt32(ctx *context.T, I1 int32, opts ...ipc.CallOpt) (O1 int32, err error)
+ EchoInt64(ctx *context.T, I1 int64, opts ...ipc.CallOpt) (O1 int64, err error)
+ EchoString(ctx *context.T, I1 string, opts ...ipc.CallOpt) (O1 string, err error)
+ EchoByte(ctx *context.T, I1 byte, opts ...ipc.CallOpt) (O1 byte, err error)
+ EchoUint32(ctx *context.T, I1 uint32, opts ...ipc.CallOpt) (O1 uint32, err error)
+ EchoUint64(ctx *context.T, I1 uint64, opts ...ipc.CallOpt) (O1 uint64, err error)
// Methods to test support for composite types.
- XEchoArray(ctx *__context.T, I1 Array2Int, opts ...__ipc.CallOpt) (O1 Array2Int, err error)
- XEchoMap(ctx *__context.T, I1 map[int32]string, opts ...__ipc.CallOpt) (O1 map[int32]string, err error)
- XEchoSet(ctx *__context.T, I1 map[int32]struct{}, opts ...__ipc.CallOpt) (O1 map[int32]struct{}, err error)
- XEchoSlice(ctx *__context.T, I1 []int32, opts ...__ipc.CallOpt) (O1 []int32, err error)
- XEchoStruct(ctx *__context.T, I1 Struct, opts ...__ipc.CallOpt) (O1 Struct, err error)
+ XEchoArray(ctx *context.T, I1 Array2Int, opts ...ipc.CallOpt) (O1 Array2Int, err error)
+ XEchoMap(ctx *context.T, I1 map[int32]string, opts ...ipc.CallOpt) (O1 map[int32]string, err error)
+ XEchoSet(ctx *context.T, I1 map[int32]struct{}, opts ...ipc.CallOpt) (O1 map[int32]struct{}, err error)
+ XEchoSlice(ctx *context.T, I1 []int32, opts ...ipc.CallOpt) (O1 []int32, err error)
+ XEchoStruct(ctx *context.T, I1 Struct, opts ...ipc.CallOpt) (O1 Struct, err error)
// Methods to test support for different number of arguments.
- YMultiArg(ctx *__context.T, I1 int32, I2 int32, opts ...__ipc.CallOpt) (O1 int32, O2 int32, err error)
- YNoArgs(*__context.T, ...__ipc.CallOpt) error
+ YMultiArg(ctx *context.T, I1 int32, I2 int32, opts ...ipc.CallOpt) (O1 int32, O2 int32, err error)
+ YNoArgs(*context.T, ...ipc.CallOpt) error
// Methods to test support for streaming.
- ZStream(ctx *__context.T, NumStreamItems int32, StreamItem bool, opts ...__ipc.CallOpt) (TypeTesterZStreamCall, error)
+ ZStream(ctx *context.T, NumStreamItems int32, StreamItem bool, opts ...ipc.CallOpt) (TypeTesterZStreamCall, error)
}
// TypeTesterClientStub adds universal methods to TypeTesterClientMethods.
type TypeTesterClientStub interface {
TypeTesterClientMethods
- __ipc.UniversalServiceMethods
+ ipc.UniversalServiceMethods
}
// TypeTesterClient returns a client stub for TypeTester.
-func TypeTesterClient(name string, opts ...__ipc.BindOpt) TypeTesterClientStub {
- var client __ipc.Client
+func TypeTesterClient(name string, opts ...ipc.BindOpt) TypeTesterClientStub {
+ var client ipc.Client
for _, opt := range opts {
- if clientOpt, ok := opt.(__ipc.Client); ok {
+ if clientOpt, ok := opt.(ipc.Client); ok {
client = clientOpt
}
}
@@ -82,18 +82,18 @@
type implTypeTesterClientStub struct {
name string
- client __ipc.Client
+ client ipc.Client
}
-func (c implTypeTesterClientStub) c(ctx *__context.T) __ipc.Client {
+func (c implTypeTesterClientStub) c(ctx *context.T) ipc.Client {
if c.client != nil {
return c.client
}
- return __veyron2.GetClient(ctx)
+ return veyron2.GetClient(ctx)
}
-func (c implTypeTesterClientStub) EchoBool(ctx *__context.T, i0 bool, opts ...__ipc.CallOpt) (o0 bool, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) EchoBool(ctx *context.T, i0 bool, opts ...ipc.CallOpt) (o0 bool, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "EchoBool", []interface{}{i0}, opts...); err != nil {
return
}
@@ -103,8 +103,8 @@
return
}
-func (c implTypeTesterClientStub) EchoFloat32(ctx *__context.T, i0 float32, opts ...__ipc.CallOpt) (o0 float32, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) EchoFloat32(ctx *context.T, i0 float32, opts ...ipc.CallOpt) (o0 float32, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "EchoFloat32", []interface{}{i0}, opts...); err != nil {
return
}
@@ -114,8 +114,8 @@
return
}
-func (c implTypeTesterClientStub) EchoFloat64(ctx *__context.T, i0 float64, opts ...__ipc.CallOpt) (o0 float64, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) EchoFloat64(ctx *context.T, i0 float64, opts ...ipc.CallOpt) (o0 float64, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "EchoFloat64", []interface{}{i0}, opts...); err != nil {
return
}
@@ -125,8 +125,8 @@
return
}
-func (c implTypeTesterClientStub) EchoInt32(ctx *__context.T, i0 int32, opts ...__ipc.CallOpt) (o0 int32, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) EchoInt32(ctx *context.T, i0 int32, opts ...ipc.CallOpt) (o0 int32, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "EchoInt32", []interface{}{i0}, opts...); err != nil {
return
}
@@ -136,8 +136,8 @@
return
}
-func (c implTypeTesterClientStub) EchoInt64(ctx *__context.T, i0 int64, opts ...__ipc.CallOpt) (o0 int64, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) EchoInt64(ctx *context.T, i0 int64, opts ...ipc.CallOpt) (o0 int64, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "EchoInt64", []interface{}{i0}, opts...); err != nil {
return
}
@@ -147,8 +147,8 @@
return
}
-func (c implTypeTesterClientStub) EchoString(ctx *__context.T, i0 string, opts ...__ipc.CallOpt) (o0 string, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) EchoString(ctx *context.T, i0 string, opts ...ipc.CallOpt) (o0 string, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "EchoString", []interface{}{i0}, opts...); err != nil {
return
}
@@ -158,8 +158,8 @@
return
}
-func (c implTypeTesterClientStub) EchoByte(ctx *__context.T, i0 byte, opts ...__ipc.CallOpt) (o0 byte, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) EchoByte(ctx *context.T, i0 byte, opts ...ipc.CallOpt) (o0 byte, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "EchoByte", []interface{}{i0}, opts...); err != nil {
return
}
@@ -169,8 +169,8 @@
return
}
-func (c implTypeTesterClientStub) EchoUint32(ctx *__context.T, i0 uint32, opts ...__ipc.CallOpt) (o0 uint32, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) EchoUint32(ctx *context.T, i0 uint32, opts ...ipc.CallOpt) (o0 uint32, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "EchoUint32", []interface{}{i0}, opts...); err != nil {
return
}
@@ -180,8 +180,8 @@
return
}
-func (c implTypeTesterClientStub) EchoUint64(ctx *__context.T, i0 uint64, opts ...__ipc.CallOpt) (o0 uint64, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) EchoUint64(ctx *context.T, i0 uint64, opts ...ipc.CallOpt) (o0 uint64, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "EchoUint64", []interface{}{i0}, opts...); err != nil {
return
}
@@ -191,8 +191,8 @@
return
}
-func (c implTypeTesterClientStub) XEchoArray(ctx *__context.T, i0 Array2Int, opts ...__ipc.CallOpt) (o0 Array2Int, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) XEchoArray(ctx *context.T, i0 Array2Int, opts ...ipc.CallOpt) (o0 Array2Int, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "XEchoArray", []interface{}{i0}, opts...); err != nil {
return
}
@@ -202,8 +202,8 @@
return
}
-func (c implTypeTesterClientStub) XEchoMap(ctx *__context.T, i0 map[int32]string, opts ...__ipc.CallOpt) (o0 map[int32]string, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) XEchoMap(ctx *context.T, i0 map[int32]string, opts ...ipc.CallOpt) (o0 map[int32]string, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "XEchoMap", []interface{}{i0}, opts...); err != nil {
return
}
@@ -213,8 +213,8 @@
return
}
-func (c implTypeTesterClientStub) XEchoSet(ctx *__context.T, i0 map[int32]struct{}, opts ...__ipc.CallOpt) (o0 map[int32]struct{}, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) XEchoSet(ctx *context.T, i0 map[int32]struct{}, opts ...ipc.CallOpt) (o0 map[int32]struct{}, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "XEchoSet", []interface{}{i0}, opts...); err != nil {
return
}
@@ -224,8 +224,8 @@
return
}
-func (c implTypeTesterClientStub) XEchoSlice(ctx *__context.T, i0 []int32, opts ...__ipc.CallOpt) (o0 []int32, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) XEchoSlice(ctx *context.T, i0 []int32, opts ...ipc.CallOpt) (o0 []int32, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "XEchoSlice", []interface{}{i0}, opts...); err != nil {
return
}
@@ -235,8 +235,8 @@
return
}
-func (c implTypeTesterClientStub) XEchoStruct(ctx *__context.T, i0 Struct, opts ...__ipc.CallOpt) (o0 Struct, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) XEchoStruct(ctx *context.T, i0 Struct, opts ...ipc.CallOpt) (o0 Struct, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "XEchoStruct", []interface{}{i0}, opts...); err != nil {
return
}
@@ -246,8 +246,8 @@
return
}
-func (c implTypeTesterClientStub) YMultiArg(ctx *__context.T, i0 int32, i1 int32, opts ...__ipc.CallOpt) (o0 int32, o1 int32, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) YMultiArg(ctx *context.T, i0 int32, i1 int32, opts ...ipc.CallOpt) (o0 int32, o1 int32, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "YMultiArg", []interface{}{i0, i1}, opts...); err != nil {
return
}
@@ -257,8 +257,8 @@
return
}
-func (c implTypeTesterClientStub) YNoArgs(ctx *__context.T, opts ...__ipc.CallOpt) (err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) YNoArgs(ctx *context.T, opts ...ipc.CallOpt) (err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "YNoArgs", nil, opts...); err != nil {
return
}
@@ -268,8 +268,8 @@
return
}
-func (c implTypeTesterClientStub) ZStream(ctx *__context.T, i0 int32, i1 bool, opts ...__ipc.CallOpt) (ocall TypeTesterZStreamCall, err error) {
- var call __ipc.Call
+func (c implTypeTesterClientStub) ZStream(ctx *context.T, i0 int32, i1 bool, opts ...ipc.CallOpt) (ocall TypeTesterZStreamCall, err error) {
+ var call ipc.Call
if call, err = c.c(ctx).StartCall(ctx, c.name, "ZStream", []interface{}{i0, i1}, opts...); err != nil {
return
}
@@ -310,7 +310,7 @@
}
type implTypeTesterZStreamCall struct {
- __ipc.Call
+ ipc.Call
valRecv bool
errRecv error
}
@@ -335,7 +335,7 @@
return c.c.valRecv
}
func (c implTypeTesterZStreamCallRecv) Err() error {
- if c.c.errRecv == __io.EOF {
+ if c.c.errRecv == io.EOF {
return nil
}
return c.c.errRecv
@@ -354,24 +354,24 @@
// test Signature output, which sorts methods alphabetically.
type TypeTesterServerMethods interface {
// Methods to test support for primitive types.
- EchoBool(ctx __ipc.ServerContext, I1 bool) (O1 bool, err error)
- EchoFloat32(ctx __ipc.ServerContext, I1 float32) (O1 float32, err error)
- EchoFloat64(ctx __ipc.ServerContext, I1 float64) (O1 float64, err error)
- EchoInt32(ctx __ipc.ServerContext, I1 int32) (O1 int32, err error)
- EchoInt64(ctx __ipc.ServerContext, I1 int64) (O1 int64, err error)
- EchoString(ctx __ipc.ServerContext, I1 string) (O1 string, err error)
- EchoByte(ctx __ipc.ServerContext, I1 byte) (O1 byte, err error)
- EchoUint32(ctx __ipc.ServerContext, I1 uint32) (O1 uint32, err error)
- EchoUint64(ctx __ipc.ServerContext, I1 uint64) (O1 uint64, err error)
+ EchoBool(ctx ipc.ServerContext, I1 bool) (O1 bool, err error)
+ EchoFloat32(ctx ipc.ServerContext, I1 float32) (O1 float32, err error)
+ EchoFloat64(ctx ipc.ServerContext, I1 float64) (O1 float64, err error)
+ EchoInt32(ctx ipc.ServerContext, I1 int32) (O1 int32, err error)
+ EchoInt64(ctx ipc.ServerContext, I1 int64) (O1 int64, err error)
+ EchoString(ctx ipc.ServerContext, I1 string) (O1 string, err error)
+ EchoByte(ctx ipc.ServerContext, I1 byte) (O1 byte, err error)
+ EchoUint32(ctx ipc.ServerContext, I1 uint32) (O1 uint32, err error)
+ EchoUint64(ctx ipc.ServerContext, I1 uint64) (O1 uint64, err error)
// Methods to test support for composite types.
- XEchoArray(ctx __ipc.ServerContext, I1 Array2Int) (O1 Array2Int, err error)
- XEchoMap(ctx __ipc.ServerContext, I1 map[int32]string) (O1 map[int32]string, err error)
- XEchoSet(ctx __ipc.ServerContext, I1 map[int32]struct{}) (O1 map[int32]struct{}, err error)
- XEchoSlice(ctx __ipc.ServerContext, I1 []int32) (O1 []int32, err error)
- XEchoStruct(ctx __ipc.ServerContext, I1 Struct) (O1 Struct, err error)
+ XEchoArray(ctx ipc.ServerContext, I1 Array2Int) (O1 Array2Int, err error)
+ XEchoMap(ctx ipc.ServerContext, I1 map[int32]string) (O1 map[int32]string, err error)
+ XEchoSet(ctx ipc.ServerContext, I1 map[int32]struct{}) (O1 map[int32]struct{}, err error)
+ XEchoSlice(ctx ipc.ServerContext, I1 []int32) (O1 []int32, err error)
+ XEchoStruct(ctx ipc.ServerContext, I1 Struct) (O1 Struct, err error)
// Methods to test support for different number of arguments.
- YMultiArg(ctx __ipc.ServerContext, I1 int32, I2 int32) (O1 int32, O2 int32, err error)
- YNoArgs(__ipc.ServerContext) error
+ YMultiArg(ctx ipc.ServerContext, I1 int32, I2 int32) (O1 int32, O2 int32, err error)
+ YNoArgs(ipc.ServerContext) error
// Methods to test support for streaming.
ZStream(ctx TypeTesterZStreamContext, NumStreamItems int32, StreamItem bool) error
}
@@ -382,24 +382,24 @@
// is the streaming methods.
type TypeTesterServerStubMethods interface {
// Methods to test support for primitive types.
- EchoBool(ctx __ipc.ServerContext, I1 bool) (O1 bool, err error)
- EchoFloat32(ctx __ipc.ServerContext, I1 float32) (O1 float32, err error)
- EchoFloat64(ctx __ipc.ServerContext, I1 float64) (O1 float64, err error)
- EchoInt32(ctx __ipc.ServerContext, I1 int32) (O1 int32, err error)
- EchoInt64(ctx __ipc.ServerContext, I1 int64) (O1 int64, err error)
- EchoString(ctx __ipc.ServerContext, I1 string) (O1 string, err error)
- EchoByte(ctx __ipc.ServerContext, I1 byte) (O1 byte, err error)
- EchoUint32(ctx __ipc.ServerContext, I1 uint32) (O1 uint32, err error)
- EchoUint64(ctx __ipc.ServerContext, I1 uint64) (O1 uint64, err error)
+ EchoBool(ctx ipc.ServerContext, I1 bool) (O1 bool, err error)
+ EchoFloat32(ctx ipc.ServerContext, I1 float32) (O1 float32, err error)
+ EchoFloat64(ctx ipc.ServerContext, I1 float64) (O1 float64, err error)
+ EchoInt32(ctx ipc.ServerContext, I1 int32) (O1 int32, err error)
+ EchoInt64(ctx ipc.ServerContext, I1 int64) (O1 int64, err error)
+ EchoString(ctx ipc.ServerContext, I1 string) (O1 string, err error)
+ EchoByte(ctx ipc.ServerContext, I1 byte) (O1 byte, err error)
+ EchoUint32(ctx ipc.ServerContext, I1 uint32) (O1 uint32, err error)
+ EchoUint64(ctx ipc.ServerContext, I1 uint64) (O1 uint64, err error)
// Methods to test support for composite types.
- XEchoArray(ctx __ipc.ServerContext, I1 Array2Int) (O1 Array2Int, err error)
- XEchoMap(ctx __ipc.ServerContext, I1 map[int32]string) (O1 map[int32]string, err error)
- XEchoSet(ctx __ipc.ServerContext, I1 map[int32]struct{}) (O1 map[int32]struct{}, err error)
- XEchoSlice(ctx __ipc.ServerContext, I1 []int32) (O1 []int32, err error)
- XEchoStruct(ctx __ipc.ServerContext, I1 Struct) (O1 Struct, err error)
+ XEchoArray(ctx ipc.ServerContext, I1 Array2Int) (O1 Array2Int, err error)
+ XEchoMap(ctx ipc.ServerContext, I1 map[int32]string) (O1 map[int32]string, err error)
+ XEchoSet(ctx ipc.ServerContext, I1 map[int32]struct{}) (O1 map[int32]struct{}, err error)
+ XEchoSlice(ctx ipc.ServerContext, I1 []int32) (O1 []int32, err error)
+ XEchoStruct(ctx ipc.ServerContext, I1 Struct) (O1 Struct, err error)
// Methods to test support for different number of arguments.
- YMultiArg(ctx __ipc.ServerContext, I1 int32, I2 int32) (O1 int32, O2 int32, err error)
- YNoArgs(__ipc.ServerContext) error
+ YMultiArg(ctx ipc.ServerContext, I1 int32, I2 int32) (O1 int32, O2 int32, err error)
+ YNoArgs(ipc.ServerContext) error
// Methods to test support for streaming.
ZStream(ctx *TypeTesterZStreamContextStub, NumStreamItems int32, StreamItem bool) error
}
@@ -408,7 +408,7 @@
type TypeTesterServerStub interface {
TypeTesterServerStubMethods
// Describe the TypeTester interfaces.
- Describe__() []__ipc.InterfaceDesc
+ Describe__() []ipc.InterfaceDesc
}
// TypeTesterServer returns a server stub for TypeTester.
@@ -420,9 +420,9 @@
}
// Initialize GlobState; always check the stub itself first, to handle the
// case where the user has the Glob method defined in their VDL source.
- if gs := __ipc.NewGlobState(stub); gs != nil {
+ if gs := ipc.NewGlobState(stub); gs != nil {
stub.gs = gs
- } else if gs := __ipc.NewGlobState(impl); gs != nil {
+ } else if gs := ipc.NewGlobState(impl); gs != nil {
stub.gs = gs
}
return stub
@@ -430,70 +430,70 @@
type implTypeTesterServerStub struct {
impl TypeTesterServerMethods
- gs *__ipc.GlobState
+ gs *ipc.GlobState
}
-func (s implTypeTesterServerStub) EchoBool(ctx __ipc.ServerContext, i0 bool) (bool, error) {
+func (s implTypeTesterServerStub) EchoBool(ctx ipc.ServerContext, i0 bool) (bool, error) {
return s.impl.EchoBool(ctx, i0)
}
-func (s implTypeTesterServerStub) EchoFloat32(ctx __ipc.ServerContext, i0 float32) (float32, error) {
+func (s implTypeTesterServerStub) EchoFloat32(ctx ipc.ServerContext, i0 float32) (float32, error) {
return s.impl.EchoFloat32(ctx, i0)
}
-func (s implTypeTesterServerStub) EchoFloat64(ctx __ipc.ServerContext, i0 float64) (float64, error) {
+func (s implTypeTesterServerStub) EchoFloat64(ctx ipc.ServerContext, i0 float64) (float64, error) {
return s.impl.EchoFloat64(ctx, i0)
}
-func (s implTypeTesterServerStub) EchoInt32(ctx __ipc.ServerContext, i0 int32) (int32, error) {
+func (s implTypeTesterServerStub) EchoInt32(ctx ipc.ServerContext, i0 int32) (int32, error) {
return s.impl.EchoInt32(ctx, i0)
}
-func (s implTypeTesterServerStub) EchoInt64(ctx __ipc.ServerContext, i0 int64) (int64, error) {
+func (s implTypeTesterServerStub) EchoInt64(ctx ipc.ServerContext, i0 int64) (int64, error) {
return s.impl.EchoInt64(ctx, i0)
}
-func (s implTypeTesterServerStub) EchoString(ctx __ipc.ServerContext, i0 string) (string, error) {
+func (s implTypeTesterServerStub) EchoString(ctx ipc.ServerContext, i0 string) (string, error) {
return s.impl.EchoString(ctx, i0)
}
-func (s implTypeTesterServerStub) EchoByte(ctx __ipc.ServerContext, i0 byte) (byte, error) {
+func (s implTypeTesterServerStub) EchoByte(ctx ipc.ServerContext, i0 byte) (byte, error) {
return s.impl.EchoByte(ctx, i0)
}
-func (s implTypeTesterServerStub) EchoUint32(ctx __ipc.ServerContext, i0 uint32) (uint32, error) {
+func (s implTypeTesterServerStub) EchoUint32(ctx ipc.ServerContext, i0 uint32) (uint32, error) {
return s.impl.EchoUint32(ctx, i0)
}
-func (s implTypeTesterServerStub) EchoUint64(ctx __ipc.ServerContext, i0 uint64) (uint64, error) {
+func (s implTypeTesterServerStub) EchoUint64(ctx ipc.ServerContext, i0 uint64) (uint64, error) {
return s.impl.EchoUint64(ctx, i0)
}
-func (s implTypeTesterServerStub) XEchoArray(ctx __ipc.ServerContext, i0 Array2Int) (Array2Int, error) {
+func (s implTypeTesterServerStub) XEchoArray(ctx ipc.ServerContext, i0 Array2Int) (Array2Int, error) {
return s.impl.XEchoArray(ctx, i0)
}
-func (s implTypeTesterServerStub) XEchoMap(ctx __ipc.ServerContext, i0 map[int32]string) (map[int32]string, error) {
+func (s implTypeTesterServerStub) XEchoMap(ctx ipc.ServerContext, i0 map[int32]string) (map[int32]string, error) {
return s.impl.XEchoMap(ctx, i0)
}
-func (s implTypeTesterServerStub) XEchoSet(ctx __ipc.ServerContext, i0 map[int32]struct{}) (map[int32]struct{}, error) {
+func (s implTypeTesterServerStub) XEchoSet(ctx ipc.ServerContext, i0 map[int32]struct{}) (map[int32]struct{}, error) {
return s.impl.XEchoSet(ctx, i0)
}
-func (s implTypeTesterServerStub) XEchoSlice(ctx __ipc.ServerContext, i0 []int32) ([]int32, error) {
+func (s implTypeTesterServerStub) XEchoSlice(ctx ipc.ServerContext, i0 []int32) ([]int32, error) {
return s.impl.XEchoSlice(ctx, i0)
}
-func (s implTypeTesterServerStub) XEchoStruct(ctx __ipc.ServerContext, i0 Struct) (Struct, error) {
+func (s implTypeTesterServerStub) XEchoStruct(ctx ipc.ServerContext, i0 Struct) (Struct, error) {
return s.impl.XEchoStruct(ctx, i0)
}
-func (s implTypeTesterServerStub) YMultiArg(ctx __ipc.ServerContext, i0 int32, i1 int32) (int32, int32, error) {
+func (s implTypeTesterServerStub) YMultiArg(ctx ipc.ServerContext, i0 int32, i1 int32) (int32, int32, error) {
return s.impl.YMultiArg(ctx, i0, i1)
}
-func (s implTypeTesterServerStub) YNoArgs(ctx __ipc.ServerContext) error {
+func (s implTypeTesterServerStub) YNoArgs(ctx ipc.ServerContext) error {
return s.impl.YNoArgs(ctx)
}
@@ -501,110 +501,110 @@
return s.impl.ZStream(ctx, i0, i1)
}
-func (s implTypeTesterServerStub) Globber() *__ipc.GlobState {
+func (s implTypeTesterServerStub) Globber() *ipc.GlobState {
return s.gs
}
-func (s implTypeTesterServerStub) Describe__() []__ipc.InterfaceDesc {
- return []__ipc.InterfaceDesc{TypeTesterDesc}
+func (s implTypeTesterServerStub) Describe__() []ipc.InterfaceDesc {
+ return []ipc.InterfaceDesc{TypeTesterDesc}
}
// TypeTesterDesc describes the TypeTester interface.
-var TypeTesterDesc __ipc.InterfaceDesc = descTypeTester
+var TypeTesterDesc ipc.InterfaceDesc = descTypeTester
// descTypeTester hides the desc to keep godoc clean.
-var descTypeTester = __ipc.InterfaceDesc{
+var descTypeTester = ipc.InterfaceDesc{
Name: "TypeTester",
PkgPath: "v.io/core/veyron/tools/vrpc/test_base",
Doc: "// TypeTester methods are listed in alphabetical order, to make it easier to\n// test Signature output, which sorts methods alphabetically.",
- Methods: []__ipc.MethodDesc{
+ Methods: []ipc.MethodDesc{
{
Name: "EchoBool",
Doc: "// Methods to test support for primitive types.",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // bool
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // bool
{"err", ``}, // error
},
},
{
Name: "EchoFloat32",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // float32
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // float32
{"err", ``}, // error
},
},
{
Name: "EchoFloat64",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // float64
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // float64
{"err", ``}, // error
},
},
{
Name: "EchoInt32",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // int32
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // int32
{"err", ``}, // error
},
},
{
Name: "EchoInt64",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // int64
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // int64
{"err", ``}, // error
},
},
{
Name: "EchoString",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // string
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // string
{"err", ``}, // error
},
},
{
Name: "EchoByte",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // byte
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // byte
{"err", ``}, // error
},
},
{
Name: "EchoUint32",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // uint32
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // uint32
{"err", ``}, // error
},
},
{
Name: "EchoUint64",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // uint64
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // uint64
{"err", ``}, // error
},
@@ -612,50 +612,50 @@
{
Name: "XEchoArray",
Doc: "// Methods to test support for composite types.",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // Array2Int
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // Array2Int
{"err", ``}, // error
},
},
{
Name: "XEchoMap",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // map[int32]string
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // map[int32]string
{"err", ``}, // error
},
},
{
Name: "XEchoSet",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // map[int32]struct{}
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // map[int32]struct{}
{"err", ``}, // error
},
},
{
Name: "XEchoSlice",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // []int32
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // []int32
{"err", ``}, // error
},
},
{
Name: "XEchoStruct",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // Struct
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // Struct
{"err", ``}, // error
},
@@ -663,11 +663,11 @@
{
Name: "YMultiArg",
Doc: "// Methods to test support for different number of arguments.",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"I1", ``}, // int32
{"I2", ``}, // int32
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"O1", ``}, // int32
{"O2", ``}, // int32
{"err", ``}, // error
@@ -675,18 +675,18 @@
},
{
Name: "YNoArgs",
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
},
{
Name: "ZStream",
Doc: "// Methods to test support for streaming.",
- InArgs: []__ipc.ArgDesc{
+ InArgs: []ipc.ArgDesc{
{"NumStreamItems", ``}, // int32
{"StreamItem", ``}, // bool
},
- OutArgs: []__ipc.ArgDesc{
+ OutArgs: []ipc.ArgDesc{
{"", ``}, // error
},
},
@@ -706,18 +706,18 @@
// TypeTesterZStreamContext represents the context passed to TypeTester.ZStream.
type TypeTesterZStreamContext interface {
- __ipc.ServerContext
+ ipc.ServerContext
TypeTesterZStreamServerStream
}
// TypeTesterZStreamContextStub is a wrapper that converts ipc.ServerCall into
// a typesafe stub that implements TypeTesterZStreamContext.
type TypeTesterZStreamContextStub struct {
- __ipc.ServerCall
+ ipc.ServerCall
}
// Init initializes TypeTesterZStreamContextStub from ipc.ServerCall.
-func (s *TypeTesterZStreamContextStub) Init(call __ipc.ServerCall) {
+func (s *TypeTesterZStreamContextStub) Init(call ipc.ServerCall) {
s.ServerCall = call
}
