unified import path

2026-02-05 07:45:23 -05:00 · 2016-08-20 20:55:45 +02:00
parent 6a878432dc
commit 07a86f549b
248 changed files with 759 additions and 757 deletions
--- a/testing/assert/address.go
+++ b/testing/assert/address.go
@@ -1,7 +1,7 @@
 package assert

 import (
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )

 func (this *Assert) Address(value v2net.Address) *AddressSubject {
--- a/testing/assert/byte.go
+++ b/testing/assert/byte.go
@@ -1,7 +1,7 @@
 package assert

 import (
-	"github.com/v2ray/v2ray-core/common/serial"
+	"v2ray.com/core/common/serial"
 )

 func (this *Assert) Byte(value byte) *ByteSubject {
--- a/testing/assert/bytes.go
+++ b/testing/assert/bytes.go
@@ -3,7 +3,7 @@ package assert
 import (
 	"bytes"

-	"github.com/v2ray/v2ray-core/common/serial"
+	"v2ray.com/core/common/serial"
 )

 func (this *Assert) Bytes(value []byte) *BytesSubject {
--- a/testing/assert/destination.go
+++ b/testing/assert/destination.go
@@ -1,7 +1,7 @@
 package assert

 import (
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )

 func (this *Assert) Destination(value v2net.Destination) *DestinationSubject {
--- a/testing/assert/int64.go
+++ b/testing/assert/int64.go
@@ -1,7 +1,7 @@
 package assert

 import (
-	"github.com/v2ray/v2ray-core/common/serial"
+	"v2ray.com/core/common/serial"
 )

 func (this *Assert) Int64(value int64) *Int64Subject {
--- a/testing/assert/intsubject.go
+++ b/testing/assert/intsubject.go
@@ -1,7 +1,7 @@
 package assert

 import (
-	"github.com/v2ray/v2ray-core/common/serial"
+	"v2ray.com/core/common/serial"
 )

 func (this *Assert) Int(value int) *IntSubject {
--- a/testing/assert/pointer.go
+++ b/testing/assert/pointer.go
@@ -3,7 +3,7 @@ package assert
 import (
 	"reflect"

-	"github.com/v2ray/v2ray-core/common/serial"
+	"v2ray.com/core/common/serial"
 )

 func (this *Assert) Pointer(value interface{}) *PointerSubject {
--- a/testing/assert/port.go
+++ b/testing/assert/port.go
@@ -1,7 +1,7 @@
 package assert

 import (
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )

 func (this *Assert) Port(value v2net.Port) *PortSubject {
--- a/testing/assert/uint16.go
+++ b/testing/assert/uint16.go
@@ -1,7 +1,7 @@
 package assert

 import (
-	"github.com/v2ray/v2ray-core/common/serial"
+	"v2ray.com/core/common/serial"
 )

 func (this *Assert) Uint16(value uint16) *Uint16Subject {
--- a/testing/assert/uint32.go
+++ b/testing/assert/uint32.go
@@ -1,7 +1,7 @@
 package assert

 import (
-	"github.com/v2ray/v2ray-core/common/serial"
+	"v2ray.com/core/common/serial"
 )

 func (this *Assert) Uint32(value uint32) *Uint32Subject {
--- a/testing/coverage/coverall
+++ b/testing/coverage/coverall
@@ -7,7 +7,7 @@ V2RAY_COV=${V2RAY_OUT}/cov
 COVERAGE_FILE=${V2RAY_COV}/coverage.txt

 function test_package {
-  DIR="github.com/v2ray/v2ray-core/$1"
+  DIR="v2ray.com/core/$1"
  DEP=$(go list -f '{{ join .Deps "\n" }}' $DIR | grep v2ray | tr '\n' ',')
  DEP=${DEP}$DIR
  RND_NAME=$(openssl rand -hex 16)
--- a/testing/scenarios/dokodemo_test.go
+++ b/testing/scenarios/dokodemo_test.go
@@ -4,9 +4,9 @@ import (
 	"net"
 	"testing"

-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/testing/assert"
-	"github.com/v2ray/v2ray-core/testing/servers/tcp"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/testing/assert"
+	"v2ray.com/core/testing/servers/tcp"
 )

 func TestDokodemoTCP(t *testing.T) {
--- a/testing/scenarios/dynamic_vmess_test.go
+++ b/testing/scenarios/dynamic_vmess_test.go
@@ -6,9 +6,9 @@ import (
 	"net"
 	"testing"

-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/testing/assert"
-	"github.com/v2ray/v2ray-core/testing/servers/tcp"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/testing/assert"
+	"v2ray.com/core/testing/servers/tcp"
 )

 func TestDynamicVMess(t *testing.T) {
--- a/testing/scenarios/http_test.go
+++ b/testing/scenarios/http_test.go
@@ -6,9 +6,9 @@ import (
 	"net/url"
 	"testing"

-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/testing/assert"
-	v2http "github.com/v2ray/v2ray-core/testing/servers/http"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/testing/assert"
+	v2http "v2ray.com/core/testing/servers/http"
 )

 func TestHttpProxy(t *testing.T) {
--- a/testing/scenarios/router_test.go
+++ b/testing/scenarios/router_test.go
@@ -4,9 +4,9 @@ import (
 	"net"
 	"testing"

-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/testing/assert"
-	"github.com/v2ray/v2ray-core/testing/servers/tcp"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/testing/assert"
+	"v2ray.com/core/testing/servers/tcp"
 )

 func TestRouter(t *testing.T) {
--- a/testing/scenarios/server_env.go
+++ b/testing/scenarios/server_env.go
@@ -7,18 +7,18 @@ import (
 	"runtime"
 	"time"

-	_ "github.com/v2ray/v2ray-core/app/router/rules"
-	"github.com/v2ray/v2ray-core/common/log"
+	_ "v2ray.com/core/app/router/rules"
+	"v2ray.com/core/common/log"

 	// The following are necessary as they register handlers in their init functions.
-	_ "github.com/v2ray/v2ray-core/proxy/blackhole"
-	_ "github.com/v2ray/v2ray-core/proxy/dokodemo"
-	_ "github.com/v2ray/v2ray-core/proxy/freedom"
-	_ "github.com/v2ray/v2ray-core/proxy/http"
-	_ "github.com/v2ray/v2ray-core/proxy/shadowsocks"
-	_ "github.com/v2ray/v2ray-core/proxy/socks"
-	_ "github.com/v2ray/v2ray-core/proxy/vmess/inbound"
-	_ "github.com/v2ray/v2ray-core/proxy/vmess/outbound"
+	_ "v2ray.com/core/proxy/blackhole"
+	_ "v2ray.com/core/proxy/dokodemo"
+	_ "v2ray.com/core/proxy/freedom"
+	_ "v2ray.com/core/proxy/http"
+	_ "v2ray.com/core/proxy/shadowsocks"
+	_ "v2ray.com/core/proxy/socks"
+	_ "v2ray.com/core/proxy/vmess/inbound"
+	_ "v2ray.com/core/proxy/vmess/outbound"
 )

 var (
--- a/testing/scenarios/server_env_coverage.go
+++ b/testing/scenarios/server_env_coverage.go
@@ -7,7 +7,7 @@ import (
 	"os/exec"
 	"path/filepath"

-	"github.com/v2ray/v2ray-core/common/uuid"
+	"v2ray.com/core/common/uuid"
 )

 func BuildV2Ray() error {
@@ -16,7 +16,7 @@ func BuildV2Ray() error {
 		return nil
 	}

-	cmd := exec.Command("go", "test", "-tags", "json coverage coveragemain", "-coverpkg", "github.com/v2ray/v2ray-core/...", "-c", "-o", binaryPath, GetSourcePath())
+	cmd := exec.Command("go", "test", "-tags", "json coverage coveragemain", "-coverpkg", "v2ray.com/core/...", "-c", "-o", binaryPath, GetSourcePath())
 	return cmd.Run()
 }

--- a/testing/scenarios/shadowsocks_test.go
+++ b/testing/scenarios/shadowsocks_test.go
@@ -4,9 +4,9 @@ import (
 	"net"
 	"testing"

-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/testing/assert"
-	"github.com/v2ray/v2ray-core/testing/servers/tcp"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/testing/assert"
+	"v2ray.com/core/testing/servers/tcp"

 	ssclient "github.com/shadowsocks/shadowsocks-go/shadowsocks"
 )
--- a/testing/scenarios/socks5_helper.go
+++ b/testing/scenarios/socks5_helper.go
@@ -1,7 +1,7 @@
 package scenarios

 import (
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )

 const (
--- a/testing/scenarios/socks_end_test.go
+++ b/testing/scenarios/socks_end_test.go
@@ -4,10 +4,10 @@ import (
 	"net"
 	"testing"

-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/testing/assert"
-	"github.com/v2ray/v2ray-core/testing/servers/tcp"
-	"github.com/v2ray/v2ray-core/testing/servers/udp"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/testing/assert"
+	"v2ray.com/core/testing/servers/tcp"
+	"v2ray.com/core/testing/servers/udp"
 )

 func TestTCPConnection(t *testing.T) {
--- a/testing/servers/http/http.go
+++ b/testing/servers/http/http.go
@@ -3,7 +3,7 @@ package tcp
 import (
 	"net/http"

-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )

 type Server struct {
--- a/testing/servers/tcp/tcp.go
+++ b/testing/servers/tcp/tcp.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net"

-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )

 type Server struct {
--- a/testing/servers/udp/udp.go
+++ b/testing/servers/udp/udp.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net"

-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )

 type Server struct {