TBR renaming v.io/core/veyron to v.io/x/ref
(and getting rid of unused shell scripts)
MultiPart: 5/13
Change-Id: I09d9df0f4dc7df3d5ca5588513be27b08fe1fd4a
diff --git a/runtimes/google/ipc/benchmark/README.txt b/runtimes/google/ipc/benchmark/README.txt
index d44723d..8ca31d3 100644
--- a/runtimes/google/ipc/benchmark/README.txt
+++ b/runtimes/google/ipc/benchmark/README.txt
@@ -23,7 +23,7 @@
overhead is excluded.
$ v23 go test -bench=. -timeout=1h -cpu=1 -benchtime=5s \
- v.io/core/veyron/runtimes/google/ipc/benchmark
+ v.io/x/ref/runtimes/google/ipc/benchmark
PASS
Benchmark____1B 1000 8301357 ns/op 0.00 MB/s
--- Histogram (unit: ms)
diff --git a/runtimes/google/ipc/benchmark/benchmark.vdl.go b/runtimes/google/ipc/benchmark/benchmark.vdl.go
index 5eb526f..7865dd1 100644
--- a/runtimes/google/ipc/benchmark/benchmark.vdl.go
+++ b/runtimes/google/ipc/benchmark/benchmark.vdl.go
@@ -246,7 +246,7 @@
// descBenchmark hides the desc to keep godoc clean.
var descBenchmark = ipc.InterfaceDesc{
Name: "Benchmark",
- PkgPath: "v.io/core/veyron/runtimes/google/ipc/benchmark",
+ PkgPath: "v.io/x/ref/runtimes/google/ipc/benchmark",
Methods: []ipc.MethodDesc{
{
Name: "Echo",
diff --git a/runtimes/google/ipc/benchmark/benchmark/main.go b/runtimes/google/ipc/benchmark/benchmark/main.go
index deba0da..147c827 100644
--- a/runtimes/google/ipc/benchmark/benchmark/main.go
+++ b/runtimes/google/ipc/benchmark/benchmark/main.go
@@ -8,9 +8,9 @@
"testing"
"time"
- tbm "v.io/core/veyron/lib/testutil/benchmark"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/runtimes/google/ipc/benchmark/internal"
+ tbm "v.io/x/ref/lib/testutil/benchmark"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/runtimes/google/ipc/benchmark/internal"
"v.io/v23"
"v.io/x/lib/vlog"
diff --git a/runtimes/google/ipc/benchmark/benchmark_test.go b/runtimes/google/ipc/benchmark/benchmark_test.go
index e5d2f3a..4107277 100644
--- a/runtimes/google/ipc/benchmark/benchmark_test.go
+++ b/runtimes/google/ipc/benchmark/benchmark_test.go
@@ -7,10 +7,10 @@
"v.io/v23"
"v.io/v23/context"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/lib/testutil/benchmark"
- _ "v.io/core/veyron/profiles/static"
- "v.io/core/veyron/runtimes/google/ipc/benchmark/internal"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/lib/testutil/benchmark"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/runtimes/google/ipc/benchmark/internal"
)
var (
diff --git a/runtimes/google/ipc/benchmark/benchmarkd/main.go b/runtimes/google/ipc/benchmark/benchmarkd/main.go
index 94ea0d1..92db8b9 100644
--- a/runtimes/google/ipc/benchmark/benchmarkd/main.go
+++ b/runtimes/google/ipc/benchmark/benchmarkd/main.go
@@ -5,9 +5,9 @@
"v.io/v23"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles/roaming"
- "v.io/core/veyron/runtimes/google/ipc/benchmark/internal"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/roaming"
+ "v.io/x/ref/runtimes/google/ipc/benchmark/internal"
)
func main() {
diff --git a/runtimes/google/ipc/benchmark/glob/glob_test.go b/runtimes/google/ipc/benchmark/glob/glob_test.go
index 3683a8d..1889c0c 100644
--- a/runtimes/google/ipc/benchmark/glob/glob_test.go
+++ b/runtimes/google/ipc/benchmark/glob/glob_test.go
@@ -10,8 +10,8 @@
"v.io/v23/naming"
"v.io/v23/security"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func TestNothing(t *testing.T) {
diff --git a/runtimes/google/ipc/benchmark/internal/client.go b/runtimes/google/ipc/benchmark/internal/client.go
index 7918b60..9b109b5 100644
--- a/runtimes/google/ipc/benchmark/internal/client.go
+++ b/runtimes/google/ipc/benchmark/internal/client.go
@@ -9,8 +9,8 @@
"v.io/v23/context"
"v.io/x/lib/vlog"
- tbm "v.io/core/veyron/lib/testutil/benchmark"
- "v.io/core/veyron/runtimes/google/ipc/benchmark"
+ tbm "v.io/x/ref/lib/testutil/benchmark"
+ "v.io/x/ref/runtimes/google/ipc/benchmark"
)
// CallEcho calls 'Echo' method 'iterations' times with the given payload size.
diff --git a/runtimes/google/ipc/benchmark/internal/server.go b/runtimes/google/ipc/benchmark/internal/server.go
index 1d20f37..5549cb6 100644
--- a/runtimes/google/ipc/benchmark/internal/server.go
+++ b/runtimes/google/ipc/benchmark/internal/server.go
@@ -1,14 +1,14 @@
package internal
import (
- "v.io/core/veyron/security/flag"
+ "v.io/x/ref/security/flag"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- "v.io/core/veyron/runtimes/google/ipc/benchmark"
+ "v.io/x/ref/runtimes/google/ipc/benchmark"
)
type impl struct {
diff --git a/runtimes/google/ipc/blessings_cache.go b/runtimes/google/ipc/blessings_cache.go
index 06ec74b..20de0cc 100644
--- a/runtimes/google/ipc/blessings_cache.go
+++ b/runtimes/google/ipc/blessings_cache.go
@@ -6,9 +6,9 @@
"reflect"
"sync"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/ipc"
"v.io/v23/security"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
// clientEncodeBlessings gets or inserts the blessings into the cache.
diff --git a/runtimes/google/ipc/cancel_test.go b/runtimes/google/ipc/cancel_test.go
index 73321da..50933ed 100644
--- a/runtimes/google/ipc/cancel_test.go
+++ b/runtimes/google/ipc/cancel_test.go
@@ -3,16 +3,16 @@
import (
"testing"
- "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
+ "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/naming"
"v.io/v23/naming/ns"
"v.io/v23/security"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
type fakeAuthorizer int
diff --git a/runtimes/google/ipc/client.go b/runtimes/google/ipc/client.go
index e2967c5..72185cb 100644
--- a/runtimes/google/ipc/client.go
+++ b/runtimes/google/ipc/client.go
@@ -11,7 +11,6 @@
"sync"
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/context"
"v.io/v23/i18n"
"v.io/v23/ipc"
@@ -24,14 +23,15 @@
"v.io/v23/vom"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/ipc/version"
- inaming "v.io/core/veyron/runtimes/google/naming"
- ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ inaming "v.io/x/ref/runtimes/google/naming"
+ ivtrace "v.io/x/ref/runtimes/google/vtrace"
)
-const pkgPath = "v.io/core/veyron/runtimes/google/ipc"
+const pkgPath = "v.io/x/ref/runtimes/google/ipc"
// TODO(cnicolaou): for local errors, automatically assign a new 'id',
// don't use pkgPath etc. Can then move them into being defined on each line
diff --git a/runtimes/google/ipc/client_test.go b/runtimes/google/ipc/client_test.go
index 292a29a..3913b9f 100644
--- a/runtimes/google/ipc/client_test.go
+++ b/runtimes/google/ipc/client_test.go
@@ -18,14 +18,14 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/flags/consts"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/modules/core"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/modules/core"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
func init() {
diff --git a/runtimes/google/ipc/debug_test.go b/runtimes/google/ipc/debug_test.go
index d291e35..f08f957 100644
--- a/runtimes/google/ipc/debug_test.go
+++ b/runtimes/google/ipc/debug_test.go
@@ -11,12 +11,12 @@
"v.io/v23/options"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/stats"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
- "v.io/core/veyron/services/mgmt/debug"
+ "v.io/x/ref/lib/stats"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
+ "v.io/x/ref/services/mgmt/debug"
)
func TestDebugServer(t *testing.T) {
diff --git a/runtimes/google/ipc/default_authorizer_test.go b/runtimes/google/ipc/default_authorizer_test.go
index ba4ecb5..c018f27 100644
--- a/runtimes/google/ipc/default_authorizer_test.go
+++ b/runtimes/google/ipc/default_authorizer_test.go
@@ -3,9 +3,9 @@
import (
"testing"
- tsecurity "v.io/core/veyron/lib/testutil/security"
"v.io/v23"
"v.io/v23/security"
+ tsecurity "v.io/x/ref/lib/testutil/security"
)
func TestDefaultAuthorizer(t *testing.T) {
diff --git a/runtimes/google/ipc/discharges.go b/runtimes/google/ipc/discharges.go
index 946f78f..ac8abdd 100644
--- a/runtimes/google/ipc/discharges.go
+++ b/runtimes/google/ipc/discharges.go
@@ -4,7 +4,7 @@
"sync"
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
"v.io/v23/context"
"v.io/v23/ipc"
diff --git a/runtimes/google/ipc/errors.vdl.go b/runtimes/google/ipc/errors.vdl.go
index be47167..5210326 100644
--- a/runtimes/google/ipc/errors.vdl.go
+++ b/runtimes/google/ipc/errors.vdl.go
@@ -14,15 +14,15 @@
)
var (
- ErrInvalidBlessings = verror.Register("v.io/core/veyron/runtimes/google/ipc.InvalidBlessings", verror.NoRetry, "{1:}{2:} All valid blessings for this request: {3} (rejected {4}) are disallowed by the policy {5} (rejected {6})")
+ ErrInvalidBlessings = verror.Register("v.io/x/ref/runtimes/google/ipc.InvalidBlessings", verror.NoRetry, "{1:}{2:} All valid blessings for this request: {3} (rejected {4}) are disallowed by the policy {5} (rejected {6})")
// Internal errors.
- errBadRequest = verror.Register("v.io/core/veyron/runtimes/google/ipc.badRequest", verror.NoRetry, "{1:}{2:} failed to decode request: {3}")
- errBadNumInputArgs = verror.Register("v.io/core/veyron/runtimes/google/ipc.badNumInputArgs", verror.NoRetry, "{1:}{2:} wrong number of input arguments for {3}.{4} (called with {5} args, want {6})")
- errBadInputArg = verror.Register("v.io/core/veyron/runtimes/google/ipc.badInputArg", verror.NoRetry, "{1:}{2:} failed to decode request {3}.{4} arg #{5}: {6}")
- errBadBlessings = verror.Register("v.io/core/veyron/runtimes/google/ipc.badBlessings", verror.NoRetry, "{1:}{2:} failed to decode blessings: {3}")
- errBadBlessingsCache = verror.Register("v.io/core/veyron/runtimes/google/ipc.badBlessingsCache", verror.NoRetry, "{1:}{2:} failed to find blessings in cache: {3}")
- errBadDischarge = verror.Register("v.io/core/veyron/runtimes/google/ipc.badDischarge", verror.NoRetry, "{1:}{2:} failed to decode discharge #{3}: {4}")
- errBadAuth = verror.Register("v.io/core/veyron/runtimes/google/ipc.badAuth", verror.NoRetry, "{1:}{2:} not authorized to call {3}.{4}: {5}")
+ errBadRequest = verror.Register("v.io/x/ref/runtimes/google/ipc.badRequest", verror.NoRetry, "{1:}{2:} failed to decode request: {3}")
+ errBadNumInputArgs = verror.Register("v.io/x/ref/runtimes/google/ipc.badNumInputArgs", verror.NoRetry, "{1:}{2:} wrong number of input arguments for {3}.{4} (called with {5} args, want {6})")
+ errBadInputArg = verror.Register("v.io/x/ref/runtimes/google/ipc.badInputArg", verror.NoRetry, "{1:}{2:} failed to decode request {3}.{4} arg #{5}: {6}")
+ errBadBlessings = verror.Register("v.io/x/ref/runtimes/google/ipc.badBlessings", verror.NoRetry, "{1:}{2:} failed to decode blessings: {3}")
+ errBadBlessingsCache = verror.Register("v.io/x/ref/runtimes/google/ipc.badBlessingsCache", verror.NoRetry, "{1:}{2:} failed to find blessings in cache: {3}")
+ errBadDischarge = verror.Register("v.io/x/ref/runtimes/google/ipc.badDischarge", verror.NoRetry, "{1:}{2:} failed to decode discharge #{3}: {4}")
+ errBadAuth = verror.Register("v.io/x/ref/runtimes/google/ipc.badAuth", verror.NoRetry, "{1:}{2:} not authorized to call {3}.{4}: {5}")
)
func init() {
diff --git a/runtimes/google/ipc/full_test.go b/runtimes/google/ipc/full_test.go
index de39fa7..a9c9702 100644
--- a/runtimes/google/ipc/full_test.go
+++ b/runtimes/google/ipc/full_test.go
@@ -15,7 +15,6 @@
"testing"
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/naming"
@@ -28,19 +27,20 @@
"v.io/v23/verror"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/netstate"
- "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/tcp"
- imanager "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/lib/publisher"
- inaming "v.io/core/veyron/runtimes/google/naming"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
- ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/netstate"
+ "v.io/x/ref/lib/stats"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/tcp"
+ imanager "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/lib/publisher"
+ inaming "v.io/x/ref/runtimes/google/naming"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
+ ivtrace "v.io/x/ref/runtimes/google/vtrace"
)
//go:generate v23 test generate
diff --git a/runtimes/google/ipc/glob_test.go b/runtimes/google/ipc/glob_test.go
index 39d9a14..57ce06f 100644
--- a/runtimes/google/ipc/glob_test.go
+++ b/runtimes/google/ipc/glob_test.go
@@ -12,9 +12,9 @@
"v.io/v23/naming"
"v.io/v23/security"
- "v.io/core/veyron/lib/glob"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/glob"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func startServer(ctx *context.T, tree *node) (string, func(), error) {
diff --git a/runtimes/google/ipc/options.go b/runtimes/google/ipc/options.go
index 59ed649..4dcb034 100644
--- a/runtimes/google/ipc/options.go
+++ b/runtimes/google/ipc/options.go
@@ -3,7 +3,7 @@
import (
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream"
+ "v.io/x/ref/runtimes/google/ipc/stream"
"v.io/v23/ipc"
"v.io/v23/naming"
diff --git a/runtimes/google/ipc/protocols/tcp/init.go b/runtimes/google/ipc/protocols/tcp/init.go
index 653ee91..92fb5b9 100644
--- a/runtimes/google/ipc/protocols/tcp/init.go
+++ b/runtimes/google/ipc/protocols/tcp/init.go
@@ -4,7 +4,7 @@
"net"
"time"
- "v.io/core/veyron/lib/tcputil"
+ "v.io/x/ref/lib/tcputil"
"v.io/v23/ipc"
"v.io/x/lib/vlog"
diff --git a/runtimes/google/ipc/protocols/ws/init.go b/runtimes/google/ipc/protocols/ws/init.go
index f2d9faf..fc01478 100644
--- a/runtimes/google/ipc/protocols/ws/init.go
+++ b/runtimes/google/ipc/protocols/ws/init.go
@@ -3,7 +3,7 @@
import (
"v.io/v23/ipc"
- "v.io/core/veyron/lib/websocket"
+ "v.io/x/ref/lib/websocket"
)
func init() {
diff --git a/runtimes/google/ipc/protocols/wsh/init.go b/runtimes/google/ipc/protocols/wsh/init.go
index 86e6e33..b7eb9b5 100644
--- a/runtimes/google/ipc/protocols/wsh/init.go
+++ b/runtimes/google/ipc/protocols/wsh/init.go
@@ -5,7 +5,7 @@
import (
"v.io/v23/ipc"
- "v.io/core/veyron/lib/websocket"
+ "v.io/x/ref/lib/websocket"
)
func init() {
diff --git a/runtimes/google/ipc/protocols/wsh_nacl/init.go b/runtimes/google/ipc/protocols/wsh_nacl/init.go
index 426cc51..82cfd48 100644
--- a/runtimes/google/ipc/protocols/wsh_nacl/init.go
+++ b/runtimes/google/ipc/protocols/wsh_nacl/init.go
@@ -5,7 +5,7 @@
import (
"v.io/v23/ipc"
- "v.io/core/veyron/lib/websocket"
+ "v.io/x/ref/lib/websocket"
)
func init() {
diff --git a/runtimes/google/ipc/proxy_test.go b/runtimes/google/ipc/proxy_test.go
index d3fa3c5..7aa3da1 100644
--- a/runtimes/google/ipc/proxy_test.go
+++ b/runtimes/google/ipc/proxy_test.go
@@ -18,18 +18,18 @@
"v.io/v23/verror"
"v.io/v23/vtrace"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/modules/core"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- iipc "v.io/core/veyron/runtimes/google/ipc"
- imanager "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- inaming "v.io/core/veyron/runtimes/google/naming"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
- ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/modules/core"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ iipc "v.io/x/ref/runtimes/google/ipc"
+ imanager "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ inaming "v.io/x/ref/runtimes/google/naming"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
+ ivtrace "v.io/x/ref/runtimes/google/vtrace"
)
func testContext() *context.T {
diff --git a/runtimes/google/ipc/reserved.go b/runtimes/google/ipc/reserved.go
index 5dbcc81..ff3f63f 100644
--- a/runtimes/google/ipc/reserved.go
+++ b/runtimes/google/ipc/reserved.go
@@ -13,7 +13,7 @@
"v.io/v23/vdlroot/signature"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/glob"
+ "v.io/x/ref/lib/glob"
)
// reservedInvoker returns a special invoker for reserved methods. This invoker
diff --git a/runtimes/google/ipc/resolve_test.go b/runtimes/google/ipc/resolve_test.go
index 973ed3b..1b93727 100644
--- a/runtimes/google/ipc/resolve_test.go
+++ b/runtimes/google/ipc/resolve_test.go
@@ -8,12 +8,12 @@
"v.io/v23"
"v.io/v23/naming"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/modules/core"
- "v.io/core/veyron/lib/testutil"
- iipc "v.io/core/veyron/runtimes/google/ipc"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/modules/core"
+ "v.io/x/ref/lib/testutil"
+ iipc "v.io/x/ref/runtimes/google/ipc"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
func startMT(t *testing.T, sh *modules.Shell) string {
diff --git a/runtimes/google/ipc/results_store_test.go b/runtimes/google/ipc/results_store_test.go
index c41bdec..6af36b7 100644
--- a/runtimes/google/ipc/results_store_test.go
+++ b/runtimes/google/ipc/results_store_test.go
@@ -5,7 +5,7 @@
"sync"
"testing"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/testutil"
)
func randomKeys() []uint64 {
diff --git a/runtimes/google/ipc/server.go b/runtimes/google/ipc/server.go
index 778cbd0..1f40e83 100644
--- a/runtimes/google/ipc/server.go
+++ b/runtimes/google/ipc/server.go
@@ -10,7 +10,6 @@
"sync"
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/config"
"v.io/v23/context"
"v.io/v23/ipc"
@@ -24,13 +23,14 @@
"v.io/v23/vom"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
- "v.io/core/veyron/lib/netstate"
- "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/lib/publisher"
- inaming "v.io/core/veyron/runtimes/google/naming"
- ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/x/ref/lib/netstate"
+ "v.io/x/ref/lib/stats"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/lib/publisher"
+ inaming "v.io/x/ref/runtimes/google/naming"
+ ivtrace "v.io/x/ref/runtimes/google/vtrace"
// TODO(cnicolaou): finish verror2 -> verror transition, in particular
// for communicating from server to client.
diff --git a/runtimes/google/ipc/server_authorizer_test.go b/runtimes/google/ipc/server_authorizer_test.go
index 05c9d47..1440dbd 100644
--- a/runtimes/google/ipc/server_authorizer_test.go
+++ b/runtimes/google/ipc/server_authorizer_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- tsecurity "v.io/core/veyron/lib/testutil/security"
+ tsecurity "v.io/x/ref/lib/testutil/security"
"v.io/v23/options"
"v.io/v23/security"
diff --git a/runtimes/google/ipc/server_test.go b/runtimes/google/ipc/server_test.go
index cf3af0a..7835d06 100644
--- a/runtimes/google/ipc/server_test.go
+++ b/runtimes/google/ipc/server_test.go
@@ -15,12 +15,12 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/netstate"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- imanager "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- inaming "v.io/core/veyron/runtimes/google/naming"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
+ "v.io/x/ref/lib/netstate"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ imanager "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ inaming "v.io/x/ref/runtimes/google/naming"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
)
type noMethodsType struct{ Field string }
diff --git a/runtimes/google/ipc/signature_test.go b/runtimes/google/ipc/signature_test.go
index c8079a8..5d35fd6 100644
--- a/runtimes/google/ipc/signature_test.go
+++ b/runtimes/google/ipc/signature_test.go
@@ -13,8 +13,8 @@
"v.io/v23/vdl"
"v.io/v23/vdlroot/signature"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func startSigServer(ctx *context.T, sig sigImpl) (string, func(), error) {
diff --git a/runtimes/google/ipc/sort_endpoints.go b/runtimes/google/ipc/sort_endpoints.go
index cb7f6d5..286a0ac 100644
--- a/runtimes/google/ipc/sort_endpoints.go
+++ b/runtimes/google/ipc/sort_endpoints.go
@@ -8,9 +8,9 @@
"v.io/v23/naming"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/netstate"
- "v.io/core/veyron/runtimes/google/ipc/version"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/x/ref/lib/netstate"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
type errorAccumulator struct {
diff --git a/runtimes/google/ipc/stats.go b/runtimes/google/ipc/stats.go
index f07561e..cbc6315 100644
--- a/runtimes/google/ipc/stats.go
+++ b/runtimes/google/ipc/stats.go
@@ -4,9 +4,9 @@
"sync"
"time"
- "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/lib/stats/counter"
- "v.io/core/veyron/lib/stats/histogram"
+ "v.io/x/ref/lib/stats"
+ "v.io/x/ref/lib/stats/counter"
+ "v.io/x/ref/lib/stats/histogram"
"v.io/v23/naming"
)
diff --git a/runtimes/google/ipc/stream/benchmark/RESULTS.txt b/runtimes/google/ipc/stream/benchmark/RESULTS.txt
index 85c78ee..d8b8e5f 100644
--- a/runtimes/google/ipc/stream/benchmark/RESULTS.txt
+++ b/runtimes/google/ipc/stream/benchmark/RESULTS.txt
@@ -2,7 +2,7 @@
Platform: Intel(R) Xeon(R) CPU E5-2689 0 @ 2.60GHz, 66114888KB Memory
$ v23 go test -bench=. -cpu=1 -benchtime=5s \
- v.io/core/veyron/runtimes/google/ipc/stream/benchmark
+ v.io/x/ref/runtimes/google/ipc/stream/benchmark
Benchmark_dial_VIF 500000 14292 ns/op
--- Histogram (unit: s)
diff --git a/runtimes/google/ipc/stream/benchmark/benchmark_test.go b/runtimes/google/ipc/stream/benchmark/benchmark_test.go
index 7122cf7..4b62a27 100644
--- a/runtimes/google/ipc/stream/benchmark/benchmark_test.go
+++ b/runtimes/google/ipc/stream/benchmark/benchmark_test.go
@@ -4,7 +4,7 @@
"os"
"testing"
- "v.io/core/veyron/lib/testutil/benchmark"
+ "v.io/x/ref/lib/testutil/benchmark"
)
// A single empty test to avoid:
diff --git a/runtimes/google/ipc/stream/benchmark/dial_vc.go b/runtimes/google/ipc/stream/benchmark/dial_vc.go
index 489be38..6eea01b 100644
--- a/runtimes/google/ipc/stream/benchmark/dial_vc.go
+++ b/runtimes/google/ipc/stream/benchmark/dial_vc.go
@@ -4,9 +4,9 @@
"testing"
"time"
- "v.io/core/veyron/lib/testutil/benchmark"
- _ "v.io/core/veyron/profiles/static"
- "v.io/core/veyron/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/lib/testutil/benchmark"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/runtimes/google/ipc/stream/manager"
"v.io/v23/naming"
"v.io/v23/options"
diff --git a/runtimes/google/ipc/stream/benchmark/dial_vif.go b/runtimes/google/ipc/stream/benchmark/dial_vif.go
index 62b6bd5..f0524e2 100644
--- a/runtimes/google/ipc/stream/benchmark/dial_vif.go
+++ b/runtimes/google/ipc/stream/benchmark/dial_vif.go
@@ -5,8 +5,8 @@
"testing"
"time"
- "v.io/core/veyron/lib/testutil/benchmark"
- "v.io/core/veyron/runtimes/google/ipc/stream/vif"
+ "v.io/x/ref/lib/testutil/benchmark"
+ "v.io/x/ref/runtimes/google/ipc/stream/vif"
"v.io/v23/naming"
"v.io/v23/options"
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_flow.go b/runtimes/google/ipc/stream/benchmark/throughput_flow.go
index 8ab5def..02c1cd8 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_flow.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_flow.go
@@ -4,11 +4,11 @@
"io"
"testing"
- "v.io/core/veyron/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/naming"
"v.io/v23/options"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
const (
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_tls.go b/runtimes/google/ipc/stream/benchmark/throughput_tls.go
index e727fe3..ed937fb 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_tls.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_tls.go
@@ -6,7 +6,7 @@
"net"
"testing"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
)
func benchmarkTLS(b *testing.B, nConns int) {
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_ws.go b/runtimes/google/ipc/stream/benchmark/throughput_ws.go
index aa07582..551a0fb 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_ws.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_ws.go
@@ -5,7 +5,7 @@
"net"
"testing"
- "v.io/core/veyron/lib/websocket"
+ "v.io/x/ref/lib/websocket"
)
// benchmarkWS sets up nConns WS connections and measures throughput.
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_wsh.go b/runtimes/google/ipc/stream/benchmark/throughput_wsh.go
index 58066a9..a7fd748 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_wsh.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_wsh.go
@@ -5,7 +5,7 @@
"net"
"testing"
- "v.io/core/veyron/lib/websocket"
+ "v.io/x/ref/lib/websocket"
)
// benchmarkWS sets up nConns WS connections and measures throughput.
diff --git a/runtimes/google/ipc/stream/crypto/box.go b/runtimes/google/ipc/stream/crypto/box.go
index 852e7ab..7e87962 100644
--- a/runtimes/google/ipc/stream/crypto/box.go
+++ b/runtimes/google/ipc/stream/crypto/box.go
@@ -10,7 +10,7 @@
"golang.org/x/crypto/nacl/box"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
type boxcrypter struct {
diff --git a/runtimes/google/ipc/stream/crypto/box_cipher_test.go b/runtimes/google/ipc/stream/crypto/box_cipher_test.go
index 3e77663..3685ef2 100644
--- a/runtimes/google/ipc/stream/crypto/box_cipher_test.go
+++ b/runtimes/google/ipc/stream/crypto/box_cipher_test.go
@@ -7,7 +7,7 @@
"golang.org/x/crypto/nacl/box"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
)
// Add space for a MAC.
diff --git a/runtimes/google/ipc/stream/crypto/crypto.go b/runtimes/google/ipc/stream/crypto/crypto.go
index 2000798..a889231 100644
--- a/runtimes/google/ipc/stream/crypto/crypto.go
+++ b/runtimes/google/ipc/stream/crypto/crypto.go
@@ -2,7 +2,7 @@
// securing communication over VCs.
package crypto
-import "v.io/core/veyron/runtimes/google/lib/iobuf"
+import "v.io/x/ref/runtimes/google/lib/iobuf"
type Encrypter interface {
// Encrypt encrypts the provided plaintext data and returns the
diff --git a/runtimes/google/ipc/stream/crypto/crypto_test.go b/runtimes/google/ipc/stream/crypto/crypto_test.go
index b81c117..28bcdf0 100644
--- a/runtimes/google/ipc/stream/crypto/crypto_test.go
+++ b/runtimes/google/ipc/stream/crypto/crypto_test.go
@@ -7,7 +7,7 @@
"testing"
"testing/quick"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
func quickTest(t *testing.T, e Encrypter, d Decrypter) {
diff --git a/runtimes/google/ipc/stream/crypto/null.go b/runtimes/google/ipc/stream/crypto/null.go
index b8b376f..02fb7bb 100644
--- a/runtimes/google/ipc/stream/crypto/null.go
+++ b/runtimes/google/ipc/stream/crypto/null.go
@@ -1,6 +1,6 @@
package crypto
-import "v.io/core/veyron/runtimes/google/lib/iobuf"
+import "v.io/x/ref/runtimes/google/lib/iobuf"
// NewNullCrypter returns a Crypter that does no encryption/decryption.
func NewNullCrypter() Crypter { return null{} }
diff --git a/runtimes/google/ipc/stream/crypto/tls.go b/runtimes/google/ipc/stream/crypto/tls.go
index cf536be..8463f36 100644
--- a/runtimes/google/ipc/stream/crypto/tls.go
+++ b/runtimes/google/ipc/stream/crypto/tls.go
@@ -12,7 +12,7 @@
"sync"
"time"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
var errDeadlinesNotSupported = errors.New("deadlines not supported")
diff --git a/runtimes/google/ipc/stream/manager/listener.go b/runtimes/google/ipc/stream/manager/listener.go
index 1437061..88244d8 100644
--- a/runtimes/google/ipc/stream/manager/listener.go
+++ b/runtimes/google/ipc/stream/manager/listener.go
@@ -7,16 +7,16 @@
"strings"
"sync"
- "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
- "v.io/core/veyron/runtimes/google/ipc/stream/vif"
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/x/ref/runtimes/google/ipc/stream/proxy"
+ "v.io/x/ref/runtimes/google/ipc/stream/vif"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
+ inaming "v.io/x/ref/runtimes/google/naming"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/naming"
"v.io/v23/verror"
"v.io/v23/vom"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
var errListenerIsClosed = errors.New("Listener has been Closed")
diff --git a/runtimes/google/ipc/stream/manager/manager.go b/runtimes/google/ipc/stream/manager/manager.go
index 95d54ab..7f33434 100644
--- a/runtimes/google/ipc/stream/manager/manager.go
+++ b/runtimes/google/ipc/stream/manager/manager.go
@@ -14,12 +14,12 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/vif"
- "v.io/core/veyron/runtimes/google/ipc/version"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/x/ref/lib/stats"
+ "v.io/x/ref/runtimes/google/ipc/stream"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/vif"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
var errShutDown = errors.New("manager has been shut down")
diff --git a/runtimes/google/ipc/stream/manager/manager_test.go b/runtimes/google/ipc/stream/manager/manager_test.go
index 1a1442d..2b13116 100644
--- a/runtimes/google/ipc/stream/manager/manager_test.go
+++ b/runtimes/google/ipc/stream/manager/manager_test.go
@@ -12,21 +12,21 @@
"testing"
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/ipc"
"v.io/v23/naming"
"v.io/v23/security"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/tcp"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/ws"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/ipc/version"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/tcp"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/ws"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
func newPrincipal(defaultBlessing string) vc.LocalPrincipal {
diff --git a/runtimes/google/ipc/stream/message/coding.go b/runtimes/google/ipc/stream/message/coding.go
index ca2a2dc..e3ebde7 100644
--- a/runtimes/google/ipc/stream/message/coding.go
+++ b/runtimes/google/ipc/stream/message/coding.go
@@ -6,7 +6,7 @@
"fmt"
"io"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
)
var errLargerThan3ByteUint = errors.New("integer too large to represent in 3 bytes")
diff --git a/runtimes/google/ipc/stream/message/control.go b/runtimes/google/ipc/stream/message/control.go
index cfebcdb..8d18d01 100644
--- a/runtimes/google/ipc/stream/message/control.go
+++ b/runtimes/google/ipc/stream/message/control.go
@@ -5,10 +5,10 @@
"fmt"
"io"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/ipc/version"
- inaming "v.io/core/veyron/runtimes/google/naming"
"v.io/v23/naming"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
// Control is the interface implemented by all control messages.
diff --git a/runtimes/google/ipc/stream/message/counters.go b/runtimes/google/ipc/stream/message/counters.go
index 0060413..e0b9b24 100644
--- a/runtimes/google/ipc/stream/message/counters.go
+++ b/runtimes/google/ipc/stream/message/counters.go
@@ -3,7 +3,7 @@
import (
"fmt"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
)
// CounterID encapsulates the VCI and Flow used for flow control counter
diff --git a/runtimes/google/ipc/stream/message/counters_test.go b/runtimes/google/ipc/stream/message/counters_test.go
index af82141..24a67a9 100644
--- a/runtimes/google/ipc/stream/message/counters_test.go
+++ b/runtimes/google/ipc/stream/message/counters_test.go
@@ -4,7 +4,7 @@
"testing"
"testing/quick"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
)
func TestCounterID(t *testing.T) {
diff --git a/runtimes/google/ipc/stream/message/data.go b/runtimes/google/ipc/stream/message/data.go
index 88a6566..d07a0f7 100644
--- a/runtimes/google/ipc/stream/message/data.go
+++ b/runtimes/google/ipc/stream/message/data.go
@@ -3,8 +3,8 @@
import (
"fmt"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
// Data encapsulates an application data message.
diff --git a/runtimes/google/ipc/stream/message/message.go b/runtimes/google/ipc/stream/message/message.go
index 739105a..3997161 100644
--- a/runtimes/google/ipc/stream/message/message.go
+++ b/runtimes/google/ipc/stream/message/message.go
@@ -64,10 +64,10 @@
"fmt"
"io"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
const (
diff --git a/runtimes/google/ipc/stream/message/message_test.go b/runtimes/google/ipc/stream/message/message_test.go
index ccb9c83..5fb54bb 100644
--- a/runtimes/google/ipc/stream/message/message_test.go
+++ b/runtimes/google/ipc/stream/message/message_test.go
@@ -6,9 +6,9 @@
"reflect"
"testing"
- "v.io/core/veyron/runtimes/google/ipc/version"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
"v.io/v23/naming"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
// testControlCipher is a super-simple cipher that xor's each byte of the
diff --git a/runtimes/google/ipc/stream/proxy/protocol.vdl.go b/runtimes/google/ipc/stream/proxy/protocol.vdl.go
index 5a85fb1..4393b14 100644
--- a/runtimes/google/ipc/stream/proxy/protocol.vdl.go
+++ b/runtimes/google/ipc/stream/proxy/protocol.vdl.go
@@ -15,7 +15,7 @@
}
func (Request) __VDLReflect(struct {
- Name string "v.io/core/veyron/runtimes/google/ipc/stream/proxy.Request"
+ Name string "v.io/x/ref/runtimes/google/ipc/stream/proxy.Request"
}) {
}
@@ -30,7 +30,7 @@
}
func (Response) __VDLReflect(struct {
- Name string "v.io/core/veyron/runtimes/google/ipc/stream/proxy.Response"
+ Name string "v.io/x/ref/runtimes/google/ipc/stream/proxy.Response"
}) {
}
diff --git a/runtimes/google/ipc/stream/proxy/proxy.go b/runtimes/google/ipc/stream/proxy/proxy.go
index 11da1e6..f6d3846 100644
--- a/runtimes/google/ipc/stream/proxy/proxy.go
+++ b/runtimes/google/ipc/stream/proxy/proxy.go
@@ -13,21 +13,21 @@
"v.io/v23/vom"
"v.io/x/lib/vlog"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/ipc/stream/message"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/ipc/stream/vif"
- "v.io/core/veyron/runtimes/google/ipc/version"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/bqueue/drrqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/message"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/stream/vif"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/bqueue/drrqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
- "v.io/core/veyron/lib/stats"
+ "v.io/x/ref/lib/stats"
)
-const pkgPath = "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
+const pkgPath = "v.io/x/ref/runtimes/google/ipc/stream/proxy"
var (
errNoRoutingTableEntry = errors.New("routing table has no entry for the VC")
diff --git a/runtimes/google/ipc/stream/proxy/proxy_test.go b/runtimes/google/ipc/stream/proxy/proxy_test.go
index 3c8c283..b88d179 100644
--- a/runtimes/google/ipc/stream/proxy/proxy_test.go
+++ b/runtimes/google/ipc/stream/proxy/proxy_test.go
@@ -8,14 +8,14 @@
"strings"
"testing"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/naming"
+ "v.io/x/ref/runtimes/google/ipc/stream"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/proxy"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
)
//go:generate v23 test generate
diff --git a/runtimes/google/ipc/stream/proxy/v23_internal_test.go b/runtimes/google/ipc/stream/proxy/v23_internal_test.go
index f88d024..cea70bf 100644
--- a/runtimes/google/ipc/stream/proxy/v23_internal_test.go
+++ b/runtimes/google/ipc/stream/proxy/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/ipc/stream/vc/auth.go b/runtimes/google/ipc/stream/vc/auth.go
index b8817d5..c71e645 100644
--- a/runtimes/google/ipc/stream/vc/auth.go
+++ b/runtimes/google/ipc/stream/vc/auth.go
@@ -6,8 +6,8 @@
"fmt"
"io"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
"v.io/v23/ipc/version"
"v.io/v23/security"
diff --git a/runtimes/google/ipc/stream/vc/flow.go b/runtimes/google/ipc/stream/vc/flow.go
index b86ffba..45b1436 100644
--- a/runtimes/google/ipc/stream/vc/flow.go
+++ b/runtimes/google/ipc/stream/vc/flow.go
@@ -1,9 +1,9 @@
package vc
import (
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/naming"
"v.io/v23/security"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
type flow struct {
diff --git a/runtimes/google/ipc/stream/vc/listener.go b/runtimes/google/ipc/stream/vc/listener.go
index 193bfa4..2b4a97d 100644
--- a/runtimes/google/ipc/stream/vc/listener.go
+++ b/runtimes/google/ipc/stream/vc/listener.go
@@ -3,8 +3,8 @@
import (
"errors"
- "v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ "v.io/x/ref/runtimes/google/ipc/stream"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
)
var errListenerClosed = errors.New("Listener has been closed")
diff --git a/runtimes/google/ipc/stream/vc/listener_test.go b/runtimes/google/ipc/stream/vc/listener_test.go
index 1d81edd..c352174 100644
--- a/runtimes/google/ipc/stream/vc/listener_test.go
+++ b/runtimes/google/ipc/stream/vc/listener_test.go
@@ -3,9 +3,9 @@
import (
"testing"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/naming"
"v.io/v23/security"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
type noopFlow struct{}
diff --git a/runtimes/google/ipc/stream/vc/reader.go b/runtimes/google/ipc/stream/vc/reader.go
index bb2f046..9a6072e 100644
--- a/runtimes/google/ipc/stream/vc/reader.go
+++ b/runtimes/google/ipc/stream/vc/reader.go
@@ -6,9 +6,9 @@
"sync"
"sync/atomic"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
)
// readHandler is the interface used by the reader to notify other components
diff --git a/runtimes/google/ipc/stream/vc/reader_test.go b/runtimes/google/ipc/stream/vc/reader_test.go
index a2100ba..8d2d8a0 100644
--- a/runtimes/google/ipc/stream/vc/reader_test.go
+++ b/runtimes/google/ipc/stream/vc/reader_test.go
@@ -7,7 +7,7 @@
"testing"
"testing/quick"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
type testReadHandler struct{ items []uint }
diff --git a/runtimes/google/ipc/stream/vc/v23_internal_test.go b/runtimes/google/ipc/stream/vc/v23_internal_test.go
index 8309b11..bfe8e63 100644
--- a/runtimes/google/ipc/stream/vc/v23_internal_test.go
+++ b/runtimes/google/ipc/stream/vc/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/ipc/stream/vc/vc.go b/runtimes/google/ipc/stream/vc/vc.go
index 7305328..2643bd4 100644
--- a/runtimes/google/ipc/stream/vc/vc.go
+++ b/runtimes/google/ipc/stream/vc/vc.go
@@ -13,13 +13,12 @@
"sync"
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/context"
"v.io/v23/ipc/version"
"v.io/v23/naming"
@@ -27,6 +26,7 @@
"v.io/v23/security"
"v.io/v23/vom"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
var (
diff --git a/runtimes/google/ipc/stream/vc/vc_test.go b/runtimes/google/ipc/stream/vc/vc_test.go
index f8b622a..3e3f31c 100644
--- a/runtimes/google/ipc/stream/vc/vc_test.go
+++ b/runtimes/google/ipc/stream/vc/vc_test.go
@@ -14,20 +14,20 @@
"sync"
"testing"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/bqueue/drrqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/bqueue/drrqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/context"
"v.io/v23/ipc/version"
"v.io/v23/naming"
"v.io/v23/options"
"v.io/v23/security"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
var (
diff --git a/runtimes/google/ipc/stream/vc/writer.go b/runtimes/google/ipc/stream/vc/writer.go
index 3dae782..6ce40ae 100644
--- a/runtimes/google/ipc/stream/vc/writer.go
+++ b/runtimes/google/ipc/stream/vc/writer.go
@@ -7,9 +7,9 @@
"sync"
"sync/atomic"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
)
var errWriterClosed = errors.New("attempt to call Write on Flow that has been Closed")
diff --git a/runtimes/google/ipc/stream/vc/writer_test.go b/runtimes/google/ipc/stream/vc/writer_test.go
index 02a6484..c6034b7 100644
--- a/runtimes/google/ipc/stream/vc/writer_test.go
+++ b/runtimes/google/ipc/stream/vc/writer_test.go
@@ -7,10 +7,10 @@
"reflect"
"testing"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/bqueue/drrqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/bqueue/drrqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/sync"
)
// TestWrite is a very basic, easy to follow, but not very thorough test of the
diff --git a/runtimes/google/ipc/stream/vif/auth.go b/runtimes/google/ipc/stream/vif/auth.go
index 7b5af01..6a66629 100644
--- a/runtimes/google/ipc/stream/vif/auth.go
+++ b/runtimes/google/ipc/stream/vif/auth.go
@@ -8,15 +8,15 @@
"golang.org/x/crypto/nacl/box"
- "v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/message"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/ipc/version"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
ipcversion "v.io/v23/ipc/version"
"v.io/v23/options"
"v.io/v23/security"
+ "v.io/x/ref/runtimes/google/ipc/stream"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/message"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
var (
diff --git a/runtimes/google/ipc/stream/vif/set_test.go b/runtimes/google/ipc/stream/vif/set_test.go
index bea5190..4d8a454 100644
--- a/runtimes/google/ipc/stream/vif/set_test.go
+++ b/runtimes/google/ipc/stream/vif/set_test.go
@@ -12,8 +12,8 @@
"v.io/v23/ipc"
"v.io/v23/naming"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/runtimes/google/ipc/stream/vif"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/runtimes/google/ipc/stream/vif"
)
var supportsIPv6 bool
diff --git a/runtimes/google/ipc/stream/vif/setup_conn.go b/runtimes/google/ipc/stream/vif/setup_conn.go
index a983a37..7faf9d1 100644
--- a/runtimes/google/ipc/stream/vif/setup_conn.go
+++ b/runtimes/google/ipc/stream/vif/setup_conn.go
@@ -3,9 +3,9 @@
import (
"io"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/message"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/message"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
// setupConn writes the data to the net.Conn using HopSetupStream messages.
diff --git a/runtimes/google/ipc/stream/vif/setup_conn_test.go b/runtimes/google/ipc/stream/vif/setup_conn_test.go
index 562386e..e33d9e5 100644
--- a/runtimes/google/ipc/stream/vif/setup_conn_test.go
+++ b/runtimes/google/ipc/stream/vif/setup_conn_test.go
@@ -8,7 +8,7 @@
"sync"
"testing"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
const (
diff --git a/runtimes/google/ipc/stream/vif/v23_internal_test.go b/runtimes/google/ipc/stream/vif/v23_internal_test.go
index fd5f2ab..380f691 100644
--- a/runtimes/google/ipc/stream/vif/v23_internal_test.go
+++ b/runtimes/google/ipc/stream/vif/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/ipc/stream/vif/vcmap.go b/runtimes/google/ipc/stream/vif/vcmap.go
index 5669304..ab4f49d 100644
--- a/runtimes/google/ipc/stream/vif/vcmap.go
+++ b/runtimes/google/ipc/stream/vif/vcmap.go
@@ -4,9 +4,9 @@
"sort"
"sync"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/lib/pcqueue"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/lib/pcqueue"
)
// vcMap implements a thread-safe map of vc.VC objects (vcInfo) keyed by their VCI.
diff --git a/runtimes/google/ipc/stream/vif/vcmap_test.go b/runtimes/google/ipc/stream/vif/vcmap_test.go
index abf8056..a56dd39 100644
--- a/runtimes/google/ipc/stream/vif/vcmap_test.go
+++ b/runtimes/google/ipc/stream/vif/vcmap_test.go
@@ -4,7 +4,7 @@
"reflect"
"testing"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
)
func TestVCMap(t *testing.T) {
diff --git a/runtimes/google/ipc/stream/vif/vif.go b/runtimes/google/ipc/stream/vif/vif.go
index f142a8e..2da6ec5 100644
--- a/runtimes/google/ipc/stream/vif/vif.go
+++ b/runtimes/google/ipc/stream/vif/vif.go
@@ -14,18 +14,6 @@
"strings"
"sync"
- "v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/ipc/stream/message"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/ipc/version"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/bqueue/drrqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- "v.io/core/veyron/runtimes/google/lib/pcqueue"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
"v.io/v23/context"
"v.io/v23/naming"
"v.io/v23/options"
@@ -33,9 +21,21 @@
"v.io/v23/verror"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/message"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/bqueue/drrqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/pcqueue"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
)
-const pkgPath = "v.io/core/veyron/runtimes/google/ipc/stream/vif"
+const pkgPath = "v.io/x/ref/runtimes/google/ipc/stream/vif"
var (
errShuttingDown = verror.Register(pkgPath+".errShuttingDown", verror.NoRetry, "{1:}{2:} underlying network connection({3}) shutting down{:_}")
diff --git a/runtimes/google/ipc/stream/vif/vif_test.go b/runtimes/google/ipc/stream/vif/vif_test.go
index 1c12716..e5b3bac 100644
--- a/runtimes/google/ipc/stream/vif/vif_test.go
+++ b/runtimes/google/ipc/stream/vif/vif_test.go
@@ -16,15 +16,15 @@
"testing"
"time"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/ipc/stream/vif"
- iversion "v.io/core/veyron/runtimes/google/ipc/version"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/stream/vif"
+ iversion "v.io/x/ref/runtimes/google/ipc/version"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/ipc/version"
"v.io/v23/naming"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
//go:generate v23 test generate
diff --git a/runtimes/google/ipc/stress/internal/client.go b/runtimes/google/ipc/stress/internal/client.go
index 161467d..d5b63c2 100644
--- a/runtimes/google/ipc/stress/internal/client.go
+++ b/runtimes/google/ipc/stress/internal/client.go
@@ -9,7 +9,7 @@
"v.io/v23/context"
"v.io/x/lib/vlog"
- "v.io/core/veyron/runtimes/google/ipc/stress"
+ "v.io/x/ref/runtimes/google/ipc/stress"
)
func newArg(maxPayloadSize int) (stress.Arg, error) {
diff --git a/runtimes/google/ipc/stress/internal/server.go b/runtimes/google/ipc/stress/internal/server.go
index 909e515..afafc82 100644
--- a/runtimes/google/ipc/stress/internal/server.go
+++ b/runtimes/google/ipc/stress/internal/server.go
@@ -10,7 +10,7 @@
"v.io/v23/security"
"v.io/x/lib/vlog"
- "v.io/core/veyron/runtimes/google/ipc/stress"
+ "v.io/x/ref/runtimes/google/ipc/stress"
)
type impl struct {
diff --git a/runtimes/google/ipc/stress/internal/util.go b/runtimes/google/ipc/stress/internal/util.go
index 8cc6da9..6fc0a09 100644
--- a/runtimes/google/ipc/stress/internal/util.go
+++ b/runtimes/google/ipc/stress/internal/util.go
@@ -4,7 +4,7 @@
"crypto/md5"
"encoding/binary"
- "v.io/core/veyron/runtimes/google/ipc/stress"
+ "v.io/x/ref/runtimes/google/ipc/stress"
)
// doSum returns the MD5 checksum of the arg.
diff --git a/runtimes/google/ipc/stress/stress.vdl.go b/runtimes/google/ipc/stress/stress.vdl.go
index c23e511..33dc547 100644
--- a/runtimes/google/ipc/stress/stress.vdl.go
+++ b/runtimes/google/ipc/stress/stress.vdl.go
@@ -22,7 +22,7 @@
}
func (Arg) __VDLReflect(struct {
- Name string "v.io/core/veyron/runtimes/google/ipc/stress.Arg"
+ Name string "v.io/x/ref/runtimes/google/ipc/stress.Arg"
}) {
}
@@ -32,7 +32,7 @@
}
func (Stats) __VDLReflect(struct {
- Name string "v.io/core/veyron/runtimes/google/ipc/stress.Stats"
+ Name string "v.io/x/ref/runtimes/google/ipc/stress.Stats"
}) {
}
@@ -308,7 +308,7 @@
// descStress hides the desc to keep godoc clean.
var descStress = ipc.InterfaceDesc{
Name: "Stress",
- PkgPath: "v.io/core/veyron/runtimes/google/ipc/stress",
+ PkgPath: "v.io/x/ref/runtimes/google/ipc/stress",
Methods: []ipc.MethodDesc{
{
Name: "Sum",
diff --git a/runtimes/google/ipc/stress/stress/main.go b/runtimes/google/ipc/stress/stress/main.go
index aa42b90..ed269e9 100644
--- a/runtimes/google/ipc/stress/stress/main.go
+++ b/runtimes/google/ipc/stress/stress/main.go
@@ -12,9 +12,9 @@
"v.io/v23/context"
"v.io/x/lib/vlog"
- _ "v.io/core/veyron/profiles/static"
- "v.io/core/veyron/runtimes/google/ipc/stress"
- "v.io/core/veyron/runtimes/google/ipc/stress/internal"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/runtimes/google/ipc/stress"
+ "v.io/x/ref/runtimes/google/ipc/stress/internal"
)
var (
diff --git a/runtimes/google/ipc/stress/stressd/main.go b/runtimes/google/ipc/stress/stressd/main.go
index b8f6361..b20dfe5 100644
--- a/runtimes/google/ipc/stress/stressd/main.go
+++ b/runtimes/google/ipc/stress/stressd/main.go
@@ -9,9 +9,9 @@
"v.io/v23"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles/static"
- "v.io/core/veyron/runtimes/google/ipc/stress/internal"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/runtimes/google/ipc/stress/internal"
)
var (
diff --git a/runtimes/google/ipc/v23_test.go b/runtimes/google/ipc/v23_test.go
index 8f500e5..614873d 100644
--- a/runtimes/google/ipc/v23_test.go
+++ b/runtimes/google/ipc/v23_test.go
@@ -10,8 +10,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
func init() {
modules.RegisterChild("childPing", ``, childPing)
diff --git a/runtimes/google/ipc/version/version.go b/runtimes/google/ipc/version/version.go
index 16d8395..06a49e7 100644
--- a/runtimes/google/ipc/version/version.go
+++ b/runtimes/google/ipc/version/version.go
@@ -3,7 +3,7 @@
import (
"fmt"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ inaming "v.io/x/ref/runtimes/google/naming"
"v.io/v23/ipc/version"
"v.io/v23/naming"
diff --git a/runtimes/google/ipc/version/version_test.go b/runtimes/google/ipc/version/version_test.go
index 5b6d850..4d93993 100644
--- a/runtimes/google/ipc/version/version_test.go
+++ b/runtimes/google/ipc/version/version_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ inaming "v.io/x/ref/runtimes/google/naming"
"v.io/v23/ipc/version"
"v.io/v23/naming"
diff --git a/runtimes/google/lib/bqueue/bqueue.go b/runtimes/google/lib/bqueue/bqueue.go
index fc5c9b5..128a442 100644
--- a/runtimes/google/lib/bqueue/bqueue.go
+++ b/runtimes/google/lib/bqueue/bqueue.go
@@ -33,7 +33,7 @@
import (
"errors"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
// Priority is an integer priority. Smaller is greater priority.
diff --git a/runtimes/google/lib/bqueue/drrqueue/drrqueue.go b/runtimes/google/lib/bqueue/drrqueue/drrqueue.go
index 4210556..3b01341 100644
--- a/runtimes/google/lib/bqueue/drrqueue/drrqueue.go
+++ b/runtimes/google/lib/bqueue/drrqueue/drrqueue.go
@@ -23,10 +23,10 @@
"io"
"sync"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/deque"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/deque"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
)
// T defines the type of round-robin buffer queues. The queue has multiple
diff --git a/runtimes/google/lib/bqueue/drrqueue/drrqueue_test.go b/runtimes/google/lib/bqueue/drrqueue/drrqueue_test.go
index 01e5e1e..ddd973d 100644
--- a/runtimes/google/lib/bqueue/drrqueue/drrqueue_test.go
+++ b/runtimes/google/lib/bqueue/drrqueue/drrqueue_test.go
@@ -5,8 +5,8 @@
"runtime"
"testing"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
const (
diff --git a/runtimes/google/lib/deque/deque_test.go b/runtimes/google/lib/deque/deque_test.go
index 50a3078..bffaed0 100644
--- a/runtimes/google/lib/deque/deque_test.go
+++ b/runtimes/google/lib/deque/deque_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/testutil"
)
//go:generate v23 test generate
diff --git a/runtimes/google/lib/deque/v23_internal_test.go b/runtimes/google/lib/deque/v23_internal_test.go
index f359898..4381586 100644
--- a/runtimes/google/lib/deque/v23_internal_test.go
+++ b/runtimes/google/lib/deque/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/lib/pcqueue/v23_internal_test.go b/runtimes/google/lib/pcqueue/v23_internal_test.go
index a30e721..15b84d8 100644
--- a/runtimes/google/lib/pcqueue/v23_internal_test.go
+++ b/runtimes/google/lib/pcqueue/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/lib/publisher/publisher_test.go b/runtimes/google/lib/publisher/publisher_test.go
index ac40b9e..2721a0d 100644
--- a/runtimes/google/lib/publisher/publisher_test.go
+++ b/runtimes/google/lib/publisher/publisher_test.go
@@ -11,10 +11,10 @@
"v.io/v23/naming/ns"
"v.io/v23/vtrace"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/runtimes/google/lib/publisher"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
- ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/runtimes/google/lib/publisher"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
+ ivtrace "v.io/x/ref/runtimes/google/vtrace"
)
//go:generate v23 test generate
diff --git a/runtimes/google/lib/publisher/v23_internal_test.go b/runtimes/google/lib/publisher/v23_internal_test.go
index c41eac0..9c60f4c 100644
--- a/runtimes/google/lib/publisher/v23_internal_test.go
+++ b/runtimes/google/lib/publisher/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/lib/sync/v23_internal_test.go b/runtimes/google/lib/sync/v23_internal_test.go
index ac7ffbf..1ad406c 100644
--- a/runtimes/google/lib/sync/v23_internal_test.go
+++ b/runtimes/google/lib/sync/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/lib/sync/wait_group_test.go b/runtimes/google/lib/sync/wait_group_test.go
index a41665d..ddf883a 100644
--- a/runtimes/google/lib/sync/wait_group_test.go
+++ b/runtimes/google/lib/sync/wait_group_test.go
@@ -2,7 +2,7 @@
import (
"testing"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/testutil"
)
//go:generate v23 test generate
diff --git a/runtimes/google/lib/upcqueue/upcqueue.go b/runtimes/google/lib/upcqueue/upcqueue.go
index 5c64c92..232fa90 100644
--- a/runtimes/google/lib/upcqueue/upcqueue.go
+++ b/runtimes/google/lib/upcqueue/upcqueue.go
@@ -15,8 +15,8 @@
"errors"
"sync"
- "v.io/core/veyron/runtimes/google/lib/deque"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/lib/deque"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
)
var (
diff --git a/runtimes/google/lib/upcqueue/upcqueue_test.go b/runtimes/google/lib/upcqueue/upcqueue_test.go
index f78b347..15ac2ef 100644
--- a/runtimes/google/lib/upcqueue/upcqueue_test.go
+++ b/runtimes/google/lib/upcqueue/upcqueue_test.go
@@ -6,8 +6,8 @@
"testing"
"time"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
"v.io/x/lib/vlog"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
)
//go:generate v23 test generate
diff --git a/runtimes/google/lib/upcqueue/v23_internal_test.go b/runtimes/google/lib/upcqueue/v23_internal_test.go
index 83bc900..fe6dbaa 100644
--- a/runtimes/google/lib/upcqueue/v23_internal_test.go
+++ b/runtimes/google/lib/upcqueue/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/naming/namespace/acl_test.go b/runtimes/google/naming/namespace/acl_test.go
index 4502155..796668e 100644
--- a/runtimes/google/naming/namespace/acl_test.go
+++ b/runtimes/google/naming/namespace/acl_test.go
@@ -11,10 +11,10 @@
"v.io/v23/security"
"v.io/v23/services/security/access"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- service "v.io/core/veyron/services/mounttable/lib"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ service "v.io/x/ref/services/mounttable/lib"
)
func init() {
diff --git a/runtimes/google/naming/namespace/all_test.go b/runtimes/google/naming/namespace/all_test.go
index 2bde787..9d87d4b 100644
--- a/runtimes/google/naming/namespace/all_test.go
+++ b/runtimes/google/naming/namespace/all_test.go
@@ -18,12 +18,12 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/runtimes/google/naming/namespace"
- vsecurity "v.io/core/veyron/security"
- service "v.io/core/veyron/services/mounttable/lib"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/runtimes/google/naming/namespace"
+ vsecurity "v.io/x/ref/security"
+ service "v.io/x/ref/services/mounttable/lib"
)
//go:generate v23 test generate
diff --git a/runtimes/google/naming/namespace/glob.go b/runtimes/google/naming/namespace/glob.go
index ddf72e9..cdb70ef 100644
--- a/runtimes/google/naming/namespace/glob.go
+++ b/runtimes/google/naming/namespace/glob.go
@@ -4,7 +4,7 @@
"io"
"strings"
- "v.io/core/veyron/lib/glob"
+ "v.io/x/ref/lib/glob"
"v.io/v23"
"v.io/v23/context"
diff --git a/runtimes/google/naming/namespace/namespace.go b/runtimes/google/naming/namespace/namespace.go
index 3ece801..003feb1 100644
--- a/runtimes/google/naming/namespace/namespace.go
+++ b/runtimes/google/naming/namespace/namespace.go
@@ -5,7 +5,7 @@
"sync"
"time"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ inaming "v.io/x/ref/runtimes/google/naming"
"v.io/v23/naming"
"v.io/v23/security"
@@ -18,7 +18,7 @@
var serverPatternRegexp = regexp.MustCompile("^\\[([^\\]]+)\\](.*)")
-const pkgPath = "v.io/core/veyron/runtimes/google/naming/namespace"
+const pkgPath = "v.io/x/ref/runtimes/google/naming/namespace"
var (
errNotRootedName = verror.Register(pkgPath+".errNotRootedName", verror.NoRetry, "{1:}{2:} At least one root is not a rooted name{:_}")
diff --git a/runtimes/google/naming/namespace/parallelstartcall.go b/runtimes/google/naming/namespace/parallelstartcall.go
index 3439163..13b08ae 100644
--- a/runtimes/google/naming/namespace/parallelstartcall.go
+++ b/runtimes/google/naming/namespace/parallelstartcall.go
@@ -1,12 +1,12 @@
package namespace
import (
- inaming "v.io/core/veyron/runtimes/google/naming"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/naming"
"v.io/v23/options"
"v.io/v23/verror"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
type startStatus struct {
diff --git a/runtimes/google/naming/namespace/v23_internal_test.go b/runtimes/google/naming/namespace/v23_internal_test.go
index c0fa3a1..314919a 100644
--- a/runtimes/google/naming/namespace/v23_internal_test.go
+++ b/runtimes/google/naming/namespace/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/rt/ipc_test.go b/runtimes/google/rt/ipc_test.go
index cfc7544..b13339f 100644
--- a/runtimes/google/rt/ipc_test.go
+++ b/runtimes/google/rt/ipc_test.go
@@ -14,10 +14,10 @@
"v.io/v23/options"
"v.io/v23/security"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
"v.io/v23/verror"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
)
//go:generate v23 test generate
diff --git a/runtimes/google/rt/mgmt.go b/runtimes/google/rt/mgmt.go
index 8830113..34f1b4d 100644
--- a/runtimes/google/rt/mgmt.go
+++ b/runtimes/google/rt/mgmt.go
@@ -11,7 +11,7 @@
"v.io/v23/naming"
"v.io/v23/options"
- "v.io/core/veyron/lib/exec"
+ "v.io/x/ref/lib/exec"
)
func (rt *Runtime) initMgmt(ctx *context.T) error {
diff --git a/runtimes/google/rt/mgmt_test.go b/runtimes/google/rt/mgmt_test.go
index 3aad0f1..168dbaf 100644
--- a/runtimes/google/rt/mgmt_test.go
+++ b/runtimes/google/rt/mgmt_test.go
@@ -16,12 +16,12 @@
"v.io/v23/naming"
"v.io/v23/services/mgmt/appcycle"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- vflag "v.io/core/veyron/security/flag"
- "v.io/core/veyron/services/mgmt/device"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ vflag "v.io/x/ref/security/flag"
+ "v.io/x/ref/services/mgmt/device"
)
//go:generate v23 test generate
diff --git a/runtimes/google/rt/rt_test.go b/runtimes/google/rt/rt_test.go
index d33fba2..d564369 100644
--- a/runtimes/google/rt/rt_test.go
+++ b/runtimes/google/rt/rt_test.go
@@ -13,11 +13,11 @@
"v.io/v23/security"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/flags/consts"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- vsecurity "v.io/core/veyron/security"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ vsecurity "v.io/x/ref/security"
)
//go:generate v23 test generate
diff --git a/runtimes/google/rt/runtime.go b/runtimes/google/rt/runtime.go
index 5e1615c..6bf5d43 100644
--- a/runtimes/google/rt/runtime.go
+++ b/runtimes/google/rt/runtime.go
@@ -21,18 +21,18 @@
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/flags/buildinfo"
- "v.io/core/veyron/lib/stats"
- _ "v.io/core/veyron/lib/stats/sysstats"
- iipc "v.io/core/veyron/runtimes/google/ipc"
- "v.io/core/veyron/runtimes/google/ipc/stream"
- imanager "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/lib/dependency"
- inaming "v.io/core/veyron/runtimes/google/naming"
- "v.io/core/veyron/runtimes/google/naming/namespace"
- ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/flags/buildinfo"
+ "v.io/x/ref/lib/stats"
+ _ "v.io/x/ref/lib/stats/sysstats"
+ iipc "v.io/x/ref/runtimes/google/ipc"
+ "v.io/x/ref/runtimes/google/ipc/stream"
+ imanager "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/lib/dependency"
+ inaming "v.io/x/ref/runtimes/google/naming"
+ "v.io/x/ref/runtimes/google/naming/namespace"
+ ivtrace "v.io/x/ref/runtimes/google/vtrace"
)
type contextKey int
diff --git a/runtimes/google/rt/runtime_test.go b/runtimes/google/rt/runtime_test.go
index f806678..b45743a 100644
--- a/runtimes/google/rt/runtime_test.go
+++ b/runtimes/google/rt/runtime_test.go
@@ -7,10 +7,10 @@
"v.io/v23/context"
"v.io/v23/naming"
- "v.io/core/veyron/lib/flags"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/runtimes/google/rt"
- "v.io/core/veyron/security"
+ "v.io/x/ref/lib/flags"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/runtimes/google/rt"
+ "v.io/x/ref/security"
)
// InitForTest creates a context for use in a test.
diff --git a/runtimes/google/rt/security.go b/runtimes/google/rt/security.go
index 63ed87e..3459f68 100644
--- a/runtimes/google/rt/security.go
+++ b/runtimes/google/rt/security.go
@@ -12,9 +12,9 @@
"v.io/v23/mgmt"
"v.io/v23/security"
- "v.io/core/veyron/lib/exec"
- vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron/security/agent"
+ "v.io/x/ref/lib/exec"
+ vsecurity "v.io/x/ref/security"
+ "v.io/x/ref/security/agent"
)
func initSecurity(ctx *context.T, credentials string, client ipc.Client) (security.Principal, error) {
diff --git a/runtimes/google/rt/shutdown_servers_test.go b/runtimes/google/rt/shutdown_servers_test.go
index edae758..4970251 100644
--- a/runtimes/google/rt/shutdown_servers_test.go
+++ b/runtimes/google/rt/shutdown_servers_test.go
@@ -14,10 +14,10 @@
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/signals"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/signals"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func init() {
diff --git a/runtimes/google/rt/shutdown_test.go b/runtimes/google/rt/shutdown_test.go
index b2201e2..120b0f5 100644
--- a/runtimes/google/rt/shutdown_test.go
+++ b/runtimes/google/rt/shutdown_test.go
@@ -10,9 +10,9 @@
"v.io/v23"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/signals"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/signals"
)
//go:generate v23 test generate
diff --git a/runtimes/google/rt/signal_test.go b/runtimes/google/rt/signal_test.go
index 5401a2b..291977d 100644
--- a/runtimes/google/rt/signal_test.go
+++ b/runtimes/google/rt/signal_test.go
@@ -9,10 +9,10 @@
"testing"
"time"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func init() {
diff --git a/runtimes/google/rt/v23_test.go b/runtimes/google/rt/v23_test.go
index ab39577..4ca1965 100644
--- a/runtimes/google/rt/v23_test.go
+++ b/runtimes/google/rt/v23_test.go
@@ -10,8 +10,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
func init() {
modules.RegisterChild("noWaiters", ``, noWaiters)
diff --git a/runtimes/google/testing/concurrency/clock_test.go b/runtimes/google/testing/concurrency/clock_test.go
index e3e4714..0166971 100644
--- a/runtimes/google/testing/concurrency/clock_test.go
+++ b/runtimes/google/testing/concurrency/clock_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/testutil"
)
//go:generate v23 test generate
diff --git a/runtimes/google/testing/concurrency/mutex_test.go b/runtimes/google/testing/concurrency/mutex_test.go
index a2852b6..a87542d 100644
--- a/runtimes/google/testing/concurrency/mutex_test.go
+++ b/runtimes/google/testing/concurrency/mutex_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "v.io/core/veyron/runtimes/google/testing/concurrency"
- "v.io/core/veyron/runtimes/google/testing/concurrency/sync"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/testing/concurrency"
+ "v.io/x/ref/runtimes/google/testing/concurrency/sync"
)
var m sync.Mutex
diff --git a/runtimes/google/testing/concurrency/rwmutex_test.go b/runtimes/google/testing/concurrency/rwmutex_test.go
index a1f9bef..4d2c1fb 100644
--- a/runtimes/google/testing/concurrency/rwmutex_test.go
+++ b/runtimes/google/testing/concurrency/rwmutex_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "v.io/core/veyron/runtimes/google/testing/concurrency"
- "v.io/core/veyron/runtimes/google/testing/concurrency/sync"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/testing/concurrency"
+ "v.io/x/ref/runtimes/google/testing/concurrency/sync"
)
var rw sync.RWMutex
diff --git a/runtimes/google/testing/concurrency/sync/sync.go b/runtimes/google/testing/concurrency/sync/sync.go
index d6f20e5..6d24eaa 100644
--- a/runtimes/google/testing/concurrency/sync/sync.go
+++ b/runtimes/google/testing/concurrency/sync/sync.go
@@ -3,7 +3,7 @@
import (
"sync"
- "v.io/core/veyron/runtimes/google/testing/concurrency"
+ "v.io/x/ref/runtimes/google/testing/concurrency"
)
// Mutex is a wrapper around the Go implementation of Mutex.
diff --git a/runtimes/google/testing/concurrency/v23_internal_test.go b/runtimes/google/testing/concurrency/v23_internal_test.go
index 1069697..55d3f56 100644
--- a/runtimes/google/testing/concurrency/v23_internal_test.go
+++ b/runtimes/google/testing/concurrency/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/testing/mocks/naming/namespace.go b/runtimes/google/testing/mocks/naming/namespace.go
index 0aeb5bb..4e831c8 100644
--- a/runtimes/google/testing/mocks/naming/namespace.go
+++ b/runtimes/google/testing/mocks/naming/namespace.go
@@ -13,7 +13,7 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- vnamespace "v.io/core/veyron/runtimes/google/naming/namespace"
+ vnamespace "v.io/x/ref/runtimes/google/naming/namespace"
)
// NewSimpleNamespace returns a simple implementation of a Namespace
diff --git a/runtimes/google/vtrace/store.go b/runtimes/google/vtrace/store.go
index b8d0f41..c733ed0 100644
--- a/runtimes/google/vtrace/store.go
+++ b/runtimes/google/vtrace/store.go
@@ -10,7 +10,7 @@
"v.io/v23/uniqueid"
"v.io/v23/vtrace"
- "v.io/core/veyron/lib/flags"
+ "v.io/x/ref/lib/flags"
)
// Store implements a store for traces. The idea is to keep all the
diff --git a/runtimes/google/vtrace/store_test.go b/runtimes/google/vtrace/store_test.go
index 81808e3..d9eb1fb 100644
--- a/runtimes/google/vtrace/store_test.go
+++ b/runtimes/google/vtrace/store_test.go
@@ -9,7 +9,7 @@
"v.io/v23/uniqueid"
"v.io/v23/vtrace"
- "v.io/core/veyron/lib/flags"
+ "v.io/x/ref/lib/flags"
)
var nextid = uint64(1)
diff --git a/runtimes/google/vtrace/vtrace.go b/runtimes/google/vtrace/vtrace.go
index ddf8d51..9aca9d7 100644
--- a/runtimes/google/vtrace/vtrace.go
+++ b/runtimes/google/vtrace/vtrace.go
@@ -12,7 +12,7 @@
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/flags"
+ "v.io/x/ref/lib/flags"
)
// A span represents an annotated period of time.
diff --git a/runtimes/google/vtrace/vtrace_test.go b/runtimes/google/vtrace/vtrace_test.go
index adbb6ce..376bb30 100644
--- a/runtimes/google/vtrace/vtrace_test.go
+++ b/runtimes/google/vtrace/vtrace_test.go
@@ -14,12 +14,12 @@
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- iipc "v.io/core/veyron/runtimes/google/ipc"
- "v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ iipc "v.io/x/ref/runtimes/google/ipc"
+ "v.io/x/ref/runtimes/google/ipc/stream"
+ "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
)
func TestNewFromContext(t *testing.T) {
