TBR renaming party
MultiPart: 1/10
Change-Id: I9e13f5056ad91602af9041c036f1575946450f73
diff --git a/runtimes/google/ipc/stream/benchmark/dial_vc.go b/runtimes/google/ipc/stream/benchmark/dial_vc.go
index 387e392..489be38 100644
--- a/runtimes/google/ipc/stream/benchmark/dial_vc.go
+++ b/runtimes/google/ipc/stream/benchmark/dial_vc.go
@@ -8,8 +8,8 @@
_ "v.io/core/veyron/profiles/static"
"v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/options"
+ "v.io/v23/naming"
+ "v.io/v23/options"
)
// benchmarkDialVC measures VC creation time over the underlying VIF.
diff --git a/runtimes/google/ipc/stream/benchmark/dial_vif.go b/runtimes/google/ipc/stream/benchmark/dial_vif.go
index 6413925..62b6bd5 100644
--- a/runtimes/google/ipc/stream/benchmark/dial_vif.go
+++ b/runtimes/google/ipc/stream/benchmark/dial_vif.go
@@ -8,8 +8,8 @@
"v.io/core/veyron/lib/testutil/benchmark"
"v.io/core/veyron/runtimes/google/ipc/stream/vif"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/options"
+ "v.io/v23/naming"
+ "v.io/v23/options"
)
// benchmarkDialVIF measures VIF creation time over the underlying net connection.
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_flow.go b/runtimes/google/ipc/stream/benchmark/throughput_flow.go
index 0aa00fe..8ab5def 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_flow.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_flow.go
@@ -7,8 +7,8 @@
"v.io/core/veyron/runtimes/google/ipc/stream/manager"
"v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/options"
+ "v.io/v23/naming"
+ "v.io/v23/options"
)
const (
diff --git a/runtimes/google/ipc/stream/manager/listener.go b/runtimes/google/ipc/stream/manager/listener.go
index be0a658..7b89f71 100644
--- a/runtimes/google/ipc/stream/manager/listener.go
+++ b/runtimes/google/ipc/stream/manager/listener.go
@@ -13,10 +13,10 @@
inaming "v.io/core/veyron/runtimes/google/naming"
"v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
- "v.io/core/veyron2/vom"
+ "v.io/v23/naming"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
+ "v.io/v23/vom"
)
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 8e1d16e..ca08ba1 100644
--- a/runtimes/google/ipc/stream/manager/manager.go
+++ b/runtimes/google/ipc/stream/manager/manager.go
@@ -9,10 +9,10 @@
"sync"
"time"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/stats"
"v.io/core/veyron/runtimes/google/ipc/stream"
diff --git a/runtimes/google/ipc/stream/manager/manager_test.go b/runtimes/google/ipc/stream/manager/manager_test.go
index cd8ac68..2947930 100644
--- a/runtimes/google/ipc/stream/manager/manager_test.go
+++ b/runtimes/google/ipc/stream/manager/manager_test.go
@@ -13,10 +13,10 @@
"time"
"v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/expect"
"v.io/core/veyron/lib/modules"
diff --git a/runtimes/google/ipc/stream/message/control.go b/runtimes/google/ipc/stream/message/control.go
index e7f3f1a..6cdf9f8 100644
--- a/runtimes/google/ipc/stream/message/control.go
+++ b/runtimes/google/ipc/stream/message/control.go
@@ -8,7 +8,7 @@
"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/core/veyron2/naming"
+ "v.io/v23/naming"
)
// Control is the interface implemented by all control messages.
diff --git a/runtimes/google/ipc/stream/message/message.go b/runtimes/google/ipc/stream/message/message.go
index 9746efb..0015964 100644
--- a/runtimes/google/ipc/stream/message/message.go
+++ b/runtimes/google/ipc/stream/message/message.go
@@ -67,7 +67,7 @@
"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/core/veyron2/vlog"
+ "v.io/v23/vlog"
)
const (
diff --git a/runtimes/google/ipc/stream/message/message_test.go b/runtimes/google/ipc/stream/message/message_test.go
index d4433eb..dd8bc1c 100644
--- a/runtimes/google/ipc/stream/message/message_test.go
+++ b/runtimes/google/ipc/stream/message/message_test.go
@@ -8,7 +8,7 @@
"v.io/core/veyron/runtimes/google/ipc/version"
"v.io/core/veyron/runtimes/google/lib/iobuf"
- "v.io/core/veyron2/naming"
+ "v.io/v23/naming"
)
// testControlCipher is a super-simple cipher that xor's each byte of the
diff --git a/runtimes/google/ipc/stream/model.go b/runtimes/google/ipc/stream/model.go
index a7c4f08..b98e3db 100644
--- a/runtimes/google/ipc/stream/model.go
+++ b/runtimes/google/ipc/stream/model.go
@@ -3,8 +3,8 @@
import (
"io"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
+ "v.io/v23/naming"
+ "v.io/v23/security"
)
// Flow is the interface for a flow-controlled channel multiplexed on a Virtual
diff --git a/runtimes/google/ipc/stream/proxy/protocol.vdl.go b/runtimes/google/ipc/stream/proxy/protocol.vdl.go
index 818fc20..5a85fb1 100644
--- a/runtimes/google/ipc/stream/proxy/protocol.vdl.go
+++ b/runtimes/google/ipc/stream/proxy/protocol.vdl.go
@@ -5,7 +5,7 @@
import (
// VDL system imports
- "v.io/core/veyron2/vdl"
+ "v.io/v23/vdl"
)
// Request is the message sent by a server to request that the proxy route
diff --git a/runtimes/google/ipc/stream/proxy/proxy.go b/runtimes/google/ipc/stream/proxy/proxy.go
index 5c2f9c7..c1fbd18 100644
--- a/runtimes/google/ipc/stream/proxy/proxy.go
+++ b/runtimes/google/ipc/stream/proxy/proxy.go
@@ -6,12 +6,12 @@
"net"
"sync"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
- "v.io/core/veyron2/vom"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
+ "v.io/v23/vom"
"v.io/core/veyron/runtimes/google/ipc/stream/crypto"
"v.io/core/veyron/runtimes/google/ipc/stream/id"
diff --git a/runtimes/google/ipc/stream/proxy/proxy_test.go b/runtimes/google/ipc/stream/proxy/proxy_test.go
index 86920f7..3c8c283 100644
--- a/runtimes/google/ipc/stream/proxy/proxy_test.go
+++ b/runtimes/google/ipc/stream/proxy/proxy_test.go
@@ -9,7 +9,7 @@
"testing"
"v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron2/naming"
+ "v.io/v23/naming"
tsecurity "v.io/core/veyron/lib/testutil/security"
_ "v.io/core/veyron/profiles"
diff --git a/runtimes/google/ipc/stream/vc/auth.go b/runtimes/google/ipc/stream/vc/auth.go
index a176017..bb7a256 100644
--- a/runtimes/google/ipc/stream/vc/auth.go
+++ b/runtimes/google/ipc/stream/vc/auth.go
@@ -9,10 +9,10 @@
"v.io/core/veyron/runtimes/google/ipc/stream/crypto"
"v.io/core/veyron/runtimes/google/lib/iobuf"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc/version"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/vom"
+ "v.io/v23/context"
+ "v.io/v23/ipc/version"
+ "v.io/v23/security"
+ "v.io/v23/vom"
)
var (
diff --git a/runtimes/google/ipc/stream/vc/errors.vdl b/runtimes/google/ipc/stream/vc/errors.vdl
index fe6e864..9f4814f 100644
--- a/runtimes/google/ipc/stream/vc/errors.vdl
+++ b/runtimes/google/ipc/stream/vc/errors.vdl
@@ -1,7 +1,7 @@
package vc
import (
- "v.io/core/veyron2/security"
+ "v.io/v23/security"
)
error (
diff --git a/runtimes/google/ipc/stream/vc/errors.vdl.go b/runtimes/google/ipc/stream/vc/errors.vdl.go
index 08fb82f..a7de1e4 100644
--- a/runtimes/google/ipc/stream/vc/errors.vdl.go
+++ b/runtimes/google/ipc/stream/vc/errors.vdl.go
@@ -5,12 +5,12 @@
import (
// VDL system imports
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/i18n"
- "v.io/core/veyron2/verror"
+ "v.io/v23/context"
+ "v.io/v23/i18n"
+ "v.io/v23/verror"
// VDL user imports
- "v.io/core/veyron2/security"
+ "v.io/v23/security"
)
var (
diff --git a/runtimes/google/ipc/stream/vc/flow.go b/runtimes/google/ipc/stream/vc/flow.go
index f2cd456..b86ffba 100644
--- a/runtimes/google/ipc/stream/vc/flow.go
+++ b/runtimes/google/ipc/stream/vc/flow.go
@@ -2,8 +2,8 @@
import (
"v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
+ "v.io/v23/naming"
+ "v.io/v23/security"
)
type flow struct {
diff --git a/runtimes/google/ipc/stream/vc/init.go b/runtimes/google/ipc/stream/vc/init.go
index 2655b9b..efa0cab 100644
--- a/runtimes/google/ipc/stream/vc/init.go
+++ b/runtimes/google/ipc/stream/vc/init.go
@@ -6,8 +6,8 @@
"crypto/rand"
"fmt"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/security"
+ "v.io/v23/vlog"
)
var AnonymousPrincipal security.Principal
diff --git a/runtimes/google/ipc/stream/vc/listener_test.go b/runtimes/google/ipc/stream/vc/listener_test.go
index 1ebb9e7..6cabc70 100644
--- a/runtimes/google/ipc/stream/vc/listener_test.go
+++ b/runtimes/google/ipc/stream/vc/listener_test.go
@@ -4,8 +4,8 @@
"testing"
"v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
+ "v.io/v23/naming"
+ "v.io/v23/security"
)
type noopFlow struct{}
diff --git a/runtimes/google/ipc/stream/vc/vc.go b/runtimes/google/ipc/stream/vc/vc.go
index 074bc72..5c45530 100644
--- a/runtimes/google/ipc/stream/vc/vc.go
+++ b/runtimes/google/ipc/stream/vc/vc.go
@@ -18,13 +18,13 @@
vsync "v.io/core/veyron/runtimes/google/lib/sync"
"v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc/version"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/options"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/vlog"
- "v.io/core/veyron2/vtrace"
+ "v.io/v23/context"
+ "v.io/v23/ipc/version"
+ "v.io/v23/naming"
+ "v.io/v23/options"
+ "v.io/v23/security"
+ "v.io/v23/vlog"
+ "v.io/v23/vtrace"
)
var (
diff --git a/runtimes/google/ipc/stream/vc/vc_test.go b/runtimes/google/ipc/stream/vc/vc_test.go
index 382dcc4..8d401b8 100644
--- a/runtimes/google/ipc/stream/vc/vc_test.go
+++ b/runtimes/google/ipc/stream/vc/vc_test.go
@@ -22,11 +22,11 @@
"v.io/core/veyron/runtimes/google/lib/iobuf"
"v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc/version"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/options"
- "v.io/core/veyron2/security"
+ "v.io/v23/context"
+ "v.io/v23/ipc/version"
+ "v.io/v23/naming"
+ "v.io/v23/options"
+ "v.io/v23/security"
)
//go:generate v23 test generate
diff --git a/runtimes/google/ipc/stream/vif/auth.go b/runtimes/google/ipc/stream/vif/auth.go
index b14069b..f02d085 100644
--- a/runtimes/google/ipc/stream/vif/auth.go
+++ b/runtimes/google/ipc/stream/vif/auth.go
@@ -14,10 +14,10 @@
"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"
- "v.io/core/veyron2/context"
- ipcversion "v.io/core/veyron2/ipc/version"
- "v.io/core/veyron2/options"
- "v.io/core/veyron2/security"
+ "v.io/v23/context"
+ ipcversion "v.io/v23/ipc/version"
+ "v.io/v23/options"
+ "v.io/v23/security"
)
var (
diff --git a/runtimes/google/ipc/stream/vif/set_test.go b/runtimes/google/ipc/stream/vif/set_test.go
index d2ee78f..274f8c7 100644
--- a/runtimes/google/ipc/stream/vif/set_test.go
+++ b/runtimes/google/ipc/stream/vif/set_test.go
@@ -9,7 +9,7 @@
"testing"
"v.io/core/veyron/runtimes/google/ipc/stream/vif"
- "v.io/core/veyron2/naming"
+ "v.io/v23/naming"
)
func TestSetWithPipes(t *testing.T) {
diff --git a/runtimes/google/ipc/stream/vif/vif.go b/runtimes/google/ipc/stream/vif/vif.go
index f65189a..68e93ed 100644
--- a/runtimes/google/ipc/stream/vif/vif.go
+++ b/runtimes/google/ipc/stream/vif/vif.go
@@ -26,10 +26,10 @@
"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/core/veyron2/naming"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
- "v.io/core/veyron2/vtrace"
+ "v.io/v23/naming"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
+ "v.io/v23/vtrace"
)
const pkgPath = "v.io/core/veyron/runtimes/google/ipc/stream/vif"
diff --git a/runtimes/google/ipc/stream/vif/vif_test.go b/runtimes/google/ipc/stream/vif/vif_test.go
index 8b7a06d..738c416 100644
--- a/runtimes/google/ipc/stream/vif/vif_test.go
+++ b/runtimes/google/ipc/stream/vif/vif_test.go
@@ -23,8 +23,8 @@
iversion "v.io/core/veyron/runtimes/google/ipc/version"
"v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron2/ipc/version"
- "v.io/core/veyron2/naming"
+ "v.io/v23/ipc/version"
+ "v.io/v23/naming"
)
//go:generate v23 test generate
