TBR renaming party
MultiPart: 1/10
Change-Id: I9e13f5056ad91602af9041c036f1575946450f73
diff --git a/lib/appcycle/appcycle.go b/lib/appcycle/appcycle.go
index fe5d392..11adb5e 100644
--- a/lib/appcycle/appcycle.go
+++ b/lib/appcycle/appcycle.go
@@ -5,18 +5,18 @@
"os"
"sync"
- "v.io/core/veyron2"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/ipc"
+ "v.io/v23/vlog"
- stub "v.io/core/veyron2/services/mgmt/appcycle"
+ stub "v.io/v23/services/mgmt/appcycle"
)
type AppCycle struct {
sync.RWMutex
waiters []chan<- string
- taskTrackers []chan<- veyron2.Task
- task veyron2.Task
+ taskTrackers []chan<- v23.Task
+ task v23.Task
shutDown bool
disp *invoker
}
@@ -49,7 +49,7 @@
defer m.RUnlock()
if len(m.waiters) == 0 {
vlog.Infof("Unhandled stop. Exiting.")
- os.Exit(veyron2.UnhandledStopExitCode)
+ os.Exit(v23.UnhandledStopExitCode)
}
for _, w := range m.waiters {
select {
@@ -60,11 +60,11 @@
}
func (m *AppCycle) Stop() {
- m.stop(veyron2.LocalStop)
+ m.stop(v23.LocalStop)
}
func (*AppCycle) ForceStop() {
- os.Exit(veyron2.ForceStopExitCode)
+ os.Exit(v23.ForceStopExitCode)
}
func (m *AppCycle) WaitForStop(ch chan<- string) {
@@ -73,7 +73,7 @@
m.waiters = append(m.waiters, ch)
}
-func (m *AppCycle) TrackTask(ch chan<- veyron2.Task) {
+func (m *AppCycle) TrackTask(ch chan<- v23.Task) {
m.Lock()
defer m.Unlock()
if m.shutDown {
@@ -123,10 +123,10 @@
vlog.Infof("AppCycle Stop request from %v", blessings)
// The size of the channel should be reasonably sized to expect not to
// miss updates while we're waiting for the stream to unblock.
- ch := make(chan veyron2.Task, 10)
+ ch := make(chan v23.Task, 10)
d.ac.TrackTask(ch)
// TODO(caprita): Include identity of Stop issuer in message.
- d.ac.stop(veyron2.RemoteStop)
+ d.ac.stop(v23.RemoteStop)
for {
task, ok := <-ch
if !ok {
diff --git a/lib/exec/config.go b/lib/exec/config.go
index f6eae2e..e505b17 100644
--- a/lib/exec/config.go
+++ b/lib/exec/config.go
@@ -3,8 +3,8 @@
import (
"sync"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vom"
+ "v.io/v23/verror"
+ "v.io/v23/vom"
)
// Config defines a simple key-value configuration. Keys and values are
diff --git a/lib/exec/config_test.go b/lib/exec/config_test.go
index cdda17f..6e131c5 100644
--- a/lib/exec/config_test.go
+++ b/lib/exec/config_test.go
@@ -4,7 +4,7 @@
"reflect"
"testing"
- "v.io/core/veyron2/verror"
+ "v.io/v23/verror"
)
func checkPresent(t *testing.T, c Config, k, wantV string) {
diff --git a/lib/exec/parent.go b/lib/exec/parent.go
index 229f44e..927de09 100644
--- a/lib/exec/parent.go
+++ b/lib/exec/parent.go
@@ -14,7 +14,7 @@
"syscall"
"time"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/exec/consts"
"v.io/core/veyron/lib/timekeeper"
diff --git a/lib/expect/expect.go b/lib/expect/expect.go
index 8388d99..ced77bc 100644
--- a/lib/expect/expect.go
+++ b/lib/expect/expect.go
@@ -49,7 +49,7 @@
"strings"
"time"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
)
var (
diff --git a/lib/filelocker/locker.go b/lib/filelocker/locker.go
index 36765bc..81e417c 100644
--- a/lib/filelocker/locker.go
+++ b/lib/filelocker/locker.go
@@ -6,7 +6,7 @@
"os"
"syscall"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
)
// Unlocker is the interface to unlock a locked file.
diff --git a/lib/modules/core/core_test.go b/lib/modules/core/core_test.go
index 90a8a4e..45ac050 100644
--- a/lib/modules/core/core_test.go
+++ b/lib/modules/core/core_test.go
@@ -10,7 +10,7 @@
"testing"
"time"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/expect"
"v.io/core/veyron/lib/flags/consts"
diff --git a/lib/modules/core/echo.go b/lib/modules/core/echo.go
index 04b7e60..37e86c3 100644
--- a/lib/modules/core/echo.go
+++ b/lib/modules/core/echo.go
@@ -6,9 +6,9 @@
"os"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
+ "v.io/v23"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
"v.io/core/veyron/lib/modules"
)
@@ -47,17 +47,17 @@
}
func echoServer(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
id, mp := args[0], args[1]
disp := &treeDispatcher{id: id}
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
return err
}
defer server.Stop()
- eps, err := server.Listen(veyron2.GetListenSpec(ctx))
+ eps, err := server.Listen(v23.GetListenSpec(ctx))
if err != nil {
return err
}
@@ -73,12 +73,12 @@
}
func echoClient(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
name := args[0]
args = args[1:]
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
for _, a := range args {
h, err := client.StartCall(ctx, name, "Echo", []interface{}{a})
if err != nil {
diff --git a/lib/modules/core/mounttable.go b/lib/modules/core/mounttable.go
index f102b2f..1e95b34 100644
--- a/lib/modules/core/mounttable.go
+++ b/lib/modules/core/mounttable.go
@@ -7,9 +7,9 @@
"os"
"strings"
- "v.io/core/veyron2"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/options"
+ "v.io/v23"
+ "v.io/v23/naming"
+ "v.io/v23/options"
"v.io/core/veyron/lib/modules"
mounttable "v.io/core/veyron/services/mounttable/lib"
@@ -37,11 +37,11 @@
}
func runMT(root bool, stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
- lspec := veyron2.GetListenSpec(ctx)
- server, err := veyron2.NewServer(ctx, options.ServesMountTable(true))
+ lspec := v23.GetListenSpec(ctx)
+ server, err := v23.NewServer(ctx, options.ServesMountTable(true))
if err != nil {
return fmt.Errorf("root failed: %v", err)
}
@@ -72,10 +72,10 @@
}
func ls(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
- ns := veyron2.GetNamespace(ctx)
+ ns := v23.GetNamespace(ctx)
entry := 0
output := ""
for _, pattern := range args {
diff --git a/lib/modules/core/proxy.go b/lib/modules/core/proxy.go
index 691d1ca..2cfbd04 100644
--- a/lib/modules/core/proxy.go
+++ b/lib/modules/core/proxy.go
@@ -6,8 +6,8 @@
"os"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/naming"
+ "v.io/v23"
+ "v.io/v23/naming"
"v.io/core/veyron/lib/modules"
"v.io/core/veyron/runtimes/google/ipc/stream/proxy"
@@ -19,7 +19,7 @@
}
func proxyServer(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
expected := len(args)
@@ -28,11 +28,11 @@
return err
}
- listenSpec := veyron2.GetListenSpec(ctx)
+ listenSpec := v23.GetListenSpec(ctx)
protocol := listenSpec.Addrs[0].Protocol
addr := listenSpec.Addrs[0].Address
- proxy, err := proxy.New(rid, veyron2.GetPrincipal(ctx), protocol, addr, "")
+ proxy, err := proxy.New(rid, v23.GetPrincipal(ctx), protocol, addr, "")
if err != nil {
return err
}
@@ -40,7 +40,7 @@
fmt.Fprintf(stdout, "PID=%d\n", os.Getpid())
if expected > 0 {
- pub := publisher.New(ctx, veyron2.GetNamespace(ctx), time.Minute)
+ pub := publisher.New(ctx, v23.GetNamespace(ctx), time.Minute)
defer pub.WaitForStop()
defer pub.Stop()
pub.AddServer(proxy.Endpoint().String(), false)
diff --git a/lib/modules/core/test_identityd.go b/lib/modules/core/test_identityd.go
index 87fe38a..080fe6d 100644
--- a/lib/modules/core/test_identityd.go
+++ b/lib/modules/core/test_identityd.go
@@ -8,7 +8,7 @@
"strconv"
"time"
- "v.io/core/veyron2"
+ "v.io/v23"
"v.io/core/veyron/lib/modules"
@@ -35,7 +35,7 @@
// Duration to use for tls cert and blessing duration.
duration := 365 * 24 * time.Hour
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
// If no tlsconfig has been provided, generate new cert and key and use them.
@@ -79,7 +79,7 @@
caveats.NewMockCaveatSelector(),
nil)
- l := veyron2.GetListenSpec(ctx)
+ l := v23.GetListenSpec(ctx)
_, veyronEPs, externalHttpaddress := s.Listen(ctx, &l, *host, *httpaddr, *tlsconfig)
diff --git a/lib/modules/core/wspr.go b/lib/modules/core/wspr.go
index 8e38a84..8388f48 100644
--- a/lib/modules/core/wspr.go
+++ b/lib/modules/core/wspr.go
@@ -8,7 +8,7 @@
"v.io/core/veyron/lib/modules"
"v.io/wspr/veyron/services/wsprd/wspr"
- "v.io/core/veyron2"
+ "v.io/v23"
)
var (
@@ -21,10 +21,10 @@
}
func startWSPR(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
- l := veyron2.GetListenSpec(ctx)
+ l := v23.GetListenSpec(ctx)
proxy := wspr.NewWSPR(ctx, *port, &l, *identd, nil)
defer proxy.Shutdown()
diff --git a/lib/modules/exec.go b/lib/modules/exec.go
index 9775a71..12698a6 100644
--- a/lib/modules/exec.go
+++ b/lib/modules/exec.go
@@ -11,8 +11,8 @@
"time"
vexec "v.io/core/veyron/lib/exec"
- "v.io/core/veyron2/mgmt"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/mgmt"
+ "v.io/v23/vlog"
)
// execHandle implements both the command and Handle interfaces.
diff --git a/lib/modules/func.go b/lib/modules/func.go
index 24f1fde..4ed9a44 100644
--- a/lib/modules/func.go
+++ b/lib/modules/func.go
@@ -7,7 +7,7 @@
"sync"
"time"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
)
type pipe struct {
diff --git a/lib/modules/modules_test.go b/lib/modules/modules_test.go
index 87f5cba..847b828 100644
--- a/lib/modules/modules_test.go
+++ b/lib/modules/modules_test.go
@@ -22,7 +22,7 @@
"v.io/core/veyron/lib/testutil/security"
_ "v.io/core/veyron/profiles"
- "v.io/core/veyron2"
+ "v.io/v23"
)
const credentialsEnvPrefix = "\"" + consts.VeyronCredentials + "="
@@ -71,7 +71,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- blessing := veyron2.GetPrincipal(ctx).BlessingStore().Default()
+ blessing := v23.GetPrincipal(ctx).BlessingStore().Default()
fmt.Fprintf(stdout, "%s", blessing)
return nil
}
diff --git a/lib/modules/registry.go b/lib/modules/registry.go
index 555c1a2..93669e9 100644
--- a/lib/modules/registry.go
+++ b/lib/modules/registry.go
@@ -9,7 +9,7 @@
"sync"
"time"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
vexec "v.io/core/veyron/lib/exec"
)
diff --git a/lib/modules/shell.go b/lib/modules/shell.go
index 071a08e..243914c 100644
--- a/lib/modules/shell.go
+++ b/lib/modules/shell.go
@@ -46,14 +46,14 @@
"syscall"
"time"
- "v.io/core/veyron2/security"
+ "v.io/v23/security"
"v.io/core/veyron/lib/exec"
"v.io/core/veyron/lib/flags/consts"
"v.io/core/veyron/security/agent"
"v.io/core/veyron/security/agent/keymgr"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
+ "v.io/v23"
+ "v.io/v23/context"
)
const (
@@ -97,7 +97,7 @@
}
var err error
ctx, sh.cancelCtx = context.WithCancel(ctx)
- if ctx, err = veyron2.SetNewStreamManager(ctx); err != nil {
+ if ctx, err = v23.SetNewStreamManager(ctx); err != nil {
return nil, err
}
sh.ctx = ctx
@@ -110,7 +110,7 @@
}
sh.principal = p
if sh.principal == nil {
- sh.principal = veyron2.GetPrincipal(ctx)
+ sh.principal = v23.GetPrincipal(ctx)
}
return sh, nil
}
@@ -136,7 +136,7 @@
}()
ctx, cancel := context.WithCancel(sh.ctx)
defer cancel()
- if ctx, err = veyron2.SetNewStreamManager(ctx); err != nil {
+ if ctx, err = v23.SetNewStreamManager(ctx); err != nil {
return nil, err
}
syscall.ForkLock.RLock()
@@ -147,7 +147,7 @@
}
syscall.CloseOnExec(fd)
syscall.ForkLock.RUnlock()
- p, err := agent.NewAgentPrincipal(ctx, fd, veyron2.GetClient(ctx))
+ p, err := agent.NewAgentPrincipal(ctx, fd, v23.GetClient(ctx))
if err != nil {
syscall.Close(fd)
return nil, err
diff --git a/lib/modules/util.go b/lib/modules/util.go
index 6379255..c14ccce 100644
--- a/lib/modules/util.go
+++ b/lib/modules/util.go
@@ -10,8 +10,8 @@
vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/security"
+ "v.io/v23/vlog"
)
func newLogfile(prefix, name string) (*os.File, error) {
diff --git a/lib/netconfig/ipaux_bsd.go b/lib/netconfig/ipaux_bsd.go
index 64924a0..83c8463 100644
--- a/lib/netconfig/ipaux_bsd.go
+++ b/lib/netconfig/ipaux_bsd.go
@@ -15,7 +15,7 @@
"syscall"
"time"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
)
/*
diff --git a/lib/netconfig/ipaux_linux.go b/lib/netconfig/ipaux_linux.go
index 9afc7dd..19faa99 100644
--- a/lib/netconfig/ipaux_linux.go
+++ b/lib/netconfig/ipaux_linux.go
@@ -15,7 +15,7 @@
"time"
"unsafe"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
)
/*
diff --git a/lib/netstate/netstate.go b/lib/netstate/netstate.go
index e13a62f..673168c 100644
--- a/lib/netstate/netstate.go
+++ b/lib/netstate/netstate.go
@@ -52,7 +52,7 @@
"net"
"strings"
- "v.io/core/veyron2/ipc"
+ "v.io/v23/ipc"
"v.io/core/veyron/lib/netconfig"
)
diff --git a/lib/netstate/netstate_test.go b/lib/netstate/netstate_test.go
index 71d3596..a774ec9 100644
--- a/lib/netstate/netstate_test.go
+++ b/lib/netstate/netstate_test.go
@@ -5,7 +5,7 @@
"reflect"
"testing"
- "v.io/core/veyron2/ipc"
+ "v.io/v23/ipc"
"v.io/core/veyron/lib/netconfig"
"v.io/core/veyron/lib/netstate"
diff --git a/lib/netstate/route.go b/lib/netstate/route.go
index f430147..58515b9 100644
--- a/lib/netstate/route.go
+++ b/lib/netstate/route.go
@@ -5,7 +5,7 @@
"net"
"strings"
- "v.io/core/veyron2/ipc"
+ "v.io/v23/ipc"
"v.io/core/veyron/lib/netconfig"
)
diff --git a/lib/signals/signals.go b/lib/signals/signals.go
index 564c6c6..2401413 100644
--- a/lib/signals/signals.go
+++ b/lib/signals/signals.go
@@ -6,8 +6,8 @@
"syscall"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
+ "v.io/v23"
+ "v.io/v23/context"
)
type stopSignal string
@@ -68,7 +68,7 @@
sawStop = true
if ctx != nil {
stopWaiter := make(chan string, 1)
- veyron2.GetAppCycle(ctx).WaitForStop(stopWaiter)
+ v23.GetAppCycle(ctx).WaitForStop(stopWaiter)
go func() {
for {
ch <- stopSignal(<-stopWaiter)
diff --git a/lib/signals/signals_test.go b/lib/signals/signals_test.go
index e427ca9..7be3b58 100644
--- a/lib/signals/signals_test.go
+++ b/lib/signals/signals_test.go
@@ -11,13 +11,13 @@
"testing"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/mgmt"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/mgmt/appcycle"
- "v.io/core/veyron2/vtrace"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/mgmt"
+ "v.io/v23/naming"
+ "v.io/v23/services/mgmt/appcycle"
+ "v.io/v23/vtrace"
"v.io/core/veyron/lib/expect"
"v.io/core/veyron/lib/modules"
@@ -46,7 +46,7 @@
ctx, shutdown := testutil.InitForTest()
closeStopLoop := make(chan struct{})
- go stopLoop(veyron2.GetAppCycle(ctx).Stop, stdin, closeStopLoop)
+ go stopLoop(v23.GetAppCycle(ctx).Stop, stdin, closeStopLoop)
wait := ShutdownOnSignals(ctx, signals...)
fmt.Fprintf(stdout, "ready\n")
fmt.Fprintf(stdout, "received signal %s\n", <-wait)
@@ -74,7 +74,7 @@
defer shutdown()
closeStopLoop := make(chan struct{})
- go stopLoop(veyron2.GetAppCycle(ctx).Stop, stdin, closeStopLoop)
+ go stopLoop(v23.GetAppCycle(ctx).Stop, stdin, closeStopLoop)
ShutdownOnSignals(ctx)
fmt.Fprintf(stdout, "ready\n")
<-closeStopLoop
@@ -143,7 +143,7 @@
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
fmt.Fprintf(h.Stdin(), "stop\n")
- s.Expectf("received signal %s", veyron2.LocalStop)
+ s.Expectf("received signal %s", v23.LocalStop)
fmt.Fprintf(h.Stdin(), "close\n")
s.ExpectEOF()
@@ -160,7 +160,7 @@
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
fmt.Fprintf(h.Stdin(), "stop\n")
- s.Expectf("received signal %s", veyron2.LocalStop)
+ s.Expectf("received signal %s", v23.LocalStop)
fmt.Fprintf(h.Stdin(), "close\n")
s.ExpectEOF()
}
@@ -184,7 +184,7 @@
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
fmt.Fprintf(h.Stdin(), "stop\n")
- testExitStatus(t, h, s, veyron2.UnhandledStopExitCode)
+ testExitStatus(t, h, s, v23.UnhandledStopExitCode)
}
// TestDoubleSignal verifies that sending a succession of two signals to a child
@@ -233,7 +233,7 @@
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
fmt.Fprintf(h.Stdin(), "stop\n")
- s.Expectf("received signal %s", veyron2.LocalStop)
+ s.Expectf("received signal %s", v23.LocalStop)
fmt.Fprintf(h.Stdin(), "stop\n")
testExitStatus(t, h, s, DoubleStopExitCode)
}
@@ -335,13 +335,13 @@
}
func createConfigServer(t *testing.T, ctx *context.T) (ipc.Server, string, <-chan string) {
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
t.Fatalf("Got error: %v", err)
}
ch := make(chan string)
var ep []naming.Endpoint
- if ep, err = server.Listen(veyron2.GetListenSpec(ctx)); err != nil {
+ if ep, err = server.Listen(v23.GetListenSpec(ctx)); err != nil {
t.Fatalf("Got error: %v", err)
}
if err := server.Serve("", device.ConfigServer(&configServer{ch}), vflag.NewAuthorizerOrDie()); err != nil {
@@ -386,7 +386,7 @@
if err := stream.Finish(); err != nil {
t.Fatalf("Got error: %v", err)
}
- s.Expectf("received signal %s", veyron2.RemoteStop)
+ s.Expectf("received signal %s", v23.RemoteStop)
fmt.Fprintf(h.Stdin(), "close\n")
s.ExpectEOF()
}
diff --git a/lib/testutil/dispatcher.go b/lib/testutil/dispatcher.go
index 9516794..0b1d3ae 100644
--- a/lib/testutil/dispatcher.go
+++ b/lib/testutil/dispatcher.go
@@ -1,8 +1,8 @@
package testutil
import (
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
)
// LeafDispatcher returns a dispatcher for a single object obj, using
diff --git a/lib/testutil/glob.go b/lib/testutil/glob.go
index 90cdd5c..2bed5df 100644
--- a/lib/testutil/glob.go
+++ b/lib/testutil/glob.go
@@ -4,16 +4,16 @@
"io"
"sort"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
)
// GlobName calls __Glob on the given object with the given pattern and returns
// a sorted list of matching object names, or an error.
func GlobName(ctx *context.T, name, pattern string) ([]string, error) {
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, name, ipc.GlobMethod, []interface{}{pattern})
if err != nil {
return nil, err
diff --git a/lib/testutil/init.go b/lib/testutil/init.go
index 277d1b3..34eaeb3 100644
--- a/lib/testutil/init.go
+++ b/lib/testutil/init.go
@@ -20,9 +20,9 @@
tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/vlog"
)
const (
@@ -118,13 +118,13 @@
// InitForTest initializes a new context.T and sets a freshly created principal
// (with a single self-signed blessing) on it. The principal setting step is skipped
// if this function is invoked from a process run using the modules package.
-func InitForTest() (*context.T, veyron2.Shutdown) {
- ctx, shutdown := veyron2.Init()
+func InitForTest() (*context.T, v23.Shutdown) {
+ ctx, shutdown := v23.Init()
if len(os.Getenv("VEYRON_SHELL_HELPER_PROCESS_ENTRY_POINT")) != 0 {
return ctx, shutdown
}
var err error
- if ctx, err = veyron2.SetPrincipal(ctx, tsecurity.NewPrincipal(TestBlessing)); err != nil {
+ if ctx, err = v23.SetPrincipal(ctx, tsecurity.NewPrincipal(TestBlessing)); err != nil {
panic(err)
}
return ctx, shutdown
diff --git a/lib/testutil/security/util.go b/lib/testutil/security/util.go
index 9a93530..148e70e 100644
--- a/lib/testutil/security/util.go
+++ b/lib/testutil/security/util.go
@@ -28,8 +28,8 @@
vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/security/access"
+ "v.io/v23/security"
+ "v.io/v23/services/security/access"
)
func newCredentials() (string, security.Principal) {
diff --git a/lib/testutil/security/util_test.go b/lib/testutil/security/util_test.go
index a1e2927..b8bd2d9 100644
--- a/lib/testutil/security/util_test.go
+++ b/lib/testutil/security/util_test.go
@@ -7,8 +7,8 @@
"sort"
"testing"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/security/access"
+ "v.io/v23/security"
+ "v.io/v23/services/security/access"
_ "v.io/core/veyron/profiles"
vsecurity "v.io/core/veyron/security"
diff --git a/lib/testutil/v23tests/v23tests.go b/lib/testutil/v23tests/v23tests.go
index 2b77e43..d223688 100644
--- a/lib/testutil/v23tests/v23tests.go
+++ b/lib/testutil/v23tests/v23tests.go
@@ -87,9 +87,9 @@
"testing"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/security"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/expect"
"v.io/core/veyron/lib/modules"
@@ -123,7 +123,7 @@
TB
// The function to shutdown the context used to create the environment.
- shutdown veyron2.Shutdown
+ shutdown v23.Shutdown
// The shell to use to start commands.
shell *modules.Shell
@@ -746,11 +746,11 @@
// ...
// }
func New(t TB) *T {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
vlog.Infof("creating root principal")
principal := tsecurity.NewPrincipal("root")
- ctx, err := veyron2.SetPrincipal(ctx, principal)
+ ctx, err := v23.SetPrincipal(ctx, principal)
if err != nil {
t.Fatalf("failed to set principal: %v", err)
}
diff --git a/lib/testutil/v23tests/v23tests_test.go b/lib/testutil/v23tests/v23tests_test.go
index c792e1f..eba5db6 100644
--- a/lib/testutil/v23tests/v23tests_test.go
+++ b/lib/testutil/v23tests/v23tests_test.go
@@ -12,8 +12,8 @@
"testing"
"time"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/naming"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/expect"
"v.io/core/veyron/lib/modules"
diff --git a/lib/unixfd/unixfd.go b/lib/unixfd/unixfd.go
index 8f73871..c5dd0c4 100644
--- a/lib/unixfd/unixfd.go
+++ b/lib/unixfd/unixfd.go
@@ -14,7 +14,7 @@
"time"
"unsafe"
- "v.io/core/veyron2/ipc"
+ "v.io/v23/ipc"
)
const Network string = "unixfd"
diff --git a/lib/websocket/listener.go b/lib/websocket/listener.go
index 087c0d6..71f4167 100644
--- a/lib/websocket/listener.go
+++ b/lib/websocket/listener.go
@@ -12,7 +12,7 @@
"github.com/gorilla/websocket"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/tcputil"
"v.io/core/veyron/runtimes/google/lib/upcqueue"
diff --git a/lib/websocket/util_test.go b/lib/websocket/util_test.go
index fe06ec1..e94c9bf 100644
--- a/lib/websocket/util_test.go
+++ b/lib/websocket/util_test.go
@@ -11,7 +11,7 @@
"testing"
"time"
- "v.io/core/veyron2/ipc"
+ "v.io/v23/ipc"
)
//go:generate v23 test generate
diff --git a/lib/websocket/ws_test.go b/lib/websocket/ws_test.go
index 9c7d8a9..172a68d 100644
--- a/lib/websocket/ws_test.go
+++ b/lib/websocket/ws_test.go
@@ -5,7 +5,7 @@
"sync"
"testing"
- "v.io/core/veyron2/ipc"
+ "v.io/v23/ipc"
"v.io/core/veyron/lib/websocket"
)
