unified import path

This commit is contained in:
v2ray 2016-08-20 20:55:45 +02:00
parent 6a878432dc
commit 07a86f549b
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
248 changed files with 759 additions and 757 deletions

View File

@ -3,12 +3,14 @@ language: go
go:
- 1.7
go_import_path: v2ray.com/core
git:
depth: 5
script:
- go test -tags json github.com/v2ray/v2ray-core/...
- go test -tags json v2ray.com/core/...
after_success:
- ./testing/coverage/coverall

4
.vscode/tasks.json vendored
View File

@ -6,7 +6,7 @@
"tasks": [
{
"taskName": "build",
"args": ["-tags", "json", "github.com/v2ray/v2ray-core/..."],
"args": ["-tags", "json", "v2ray.com/core/..."],
"isBuildCommand": true,
"problemMatcher": {
"owner": "go",
@ -21,7 +21,7 @@
},
{
"taskName": "test",
"args": ["-tags", "json", "github.com/v2ray/v2ray-core/..."],
"args": ["-tags", "json", "v2ray.com/core/..."],
"isBuildCommand": false
}
]

View File

@ -5,10 +5,10 @@
[2]: https://travis-ci.org/v2ray/v2ray-core "Travis-CI Build Status"
[3]: https://codecov.io/github/v2ray/v2ray-core/coverage.svg?branch=master "Coverage badge"
[4]: https://codecov.io/github/v2ray/v2ray-core?branch=master "Codecov Status"
[5]: https://goreportcard.com/badge/github.com/v2ray/v2ray-core "Go Report badge"
[6]: https://goreportcard.com/report/github.com/v2ray/v2ray-core "Go Report"
[7]: https://godoc.org/github.com/v2ray/v2ray-core?status.svg "GoDoc badge"
[8]: https://godoc.org/github.com/v2ray/v2ray-core "GoDoc"
[5]: https://goreportcard.com/badge/v2ray.com/core "Go Report badge"
[6]: https://goreportcard.com/report/v2ray.com/core "Go Report"
[7]: https://godoc.org/v2ray.com/core?status.svg "GoDoc badge"
[8]: https://godoc.org/v2ray.com/core "GoDoc"
[9]: https://codebeat.co/badges/f2354ca8-3e24-463d-a2e3-159af73b2477 "Codebeat badge"
[10]: https://codebeat.co/projects/github-com-v2ray-v2ray-core "Codebeat"

View File

@ -1,7 +1,7 @@
package api
import (
"github.com/v2ray/v2ray-core/app"
"v2ray.com/core/app"
)
const (

View File

@ -1,7 +1,7 @@
package api
import (
v2net "github.com/v2ray/v2ray-core/common/net"
v2net "v2ray.com/core/common/net"
)
type Config struct {

View File

@ -1,9 +1,9 @@
package dispatcher
import (
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/proxy"
"github.com/v2ray/v2ray-core/transport/ray"
"v2ray.com/core/app"
"v2ray.com/core/proxy"
"v2ray.com/core/transport/ray"
)
const (

View File

@ -1,14 +1,14 @@
package impl
import (
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/app/proxyman"
"github.com/v2ray/v2ray-core/app/router"
"github.com/v2ray/v2ray-core/common/alloc"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/proxy"
"github.com/v2ray/v2ray-core/transport/ray"
"v2ray.com/core/app"
"v2ray.com/core/app/proxyman"
"v2ray.com/core/app/router"
"v2ray.com/core/common/alloc"
"v2ray.com/core/common/log"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/proxy"
"v2ray.com/core/transport/ray"
)
type DefaultDispatcher struct {

View File

@ -1,9 +1,9 @@
package testing
import (
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/proxy"
"github.com/v2ray/v2ray-core/transport/ray"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/proxy"
"v2ray.com/core/transport/ray"
)
type TestPacketDispatcher struct {

View File

@ -3,7 +3,7 @@ package dns
import (
"net"
v2net "github.com/v2ray/v2ray-core/common/net"
v2net "v2ray.com/core/common/net"
)
type Config struct {

View File

@ -7,7 +7,7 @@ import (
"errors"
"net"
v2net "github.com/v2ray/v2ray-core/common/net"
v2net "v2ray.com/core/common/net"
)
func (this *Config) UnmarshalJSON(data []byte) error {

View File

@ -6,9 +6,9 @@ import (
"encoding/json"
"testing"
. "github.com/v2ray/v2ray-core/app/dns"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/app/dns"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func TestConfigParsing(t *testing.T) {

View File

@ -3,7 +3,7 @@ package dns
import (
"net"
"github.com/v2ray/v2ray-core/app"
"v2ray.com/core/app"
)
const (

View File

@ -5,13 +5,13 @@ import (
"sync"
"time"
"github.com/v2ray/v2ray-core/app/dispatcher"
"github.com/v2ray/v2ray-core/common/alloc"
"github.com/v2ray/v2ray-core/common/dice"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/proxy"
"github.com/v2ray/v2ray-core/transport/internet/udp"
"v2ray.com/core/app/dispatcher"
"v2ray.com/core/common/alloc"
"v2ray.com/core/common/dice"
"v2ray.com/core/common/log"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/proxy"
"v2ray.com/core/transport/internet/udp"
"github.com/miekg/dns"
)

View File

@ -5,9 +5,9 @@ import (
"sync"
"time"
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/app/dispatcher"
"github.com/v2ray/v2ray-core/common/log"
"v2ray.com/core/app"
"v2ray.com/core/app/dispatcher"
"v2ray.com/core/common/log"
"github.com/miekg/dns"
)

View File

@ -4,16 +4,16 @@ import (
"net"
"testing"
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/app/dispatcher"
dispatchers "github.com/v2ray/v2ray-core/app/dispatcher/impl"
. "github.com/v2ray/v2ray-core/app/dns"
"github.com/v2ray/v2ray-core/app/proxyman"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/proxy"
"github.com/v2ray/v2ray-core/proxy/freedom"
"github.com/v2ray/v2ray-core/testing/assert"
"github.com/v2ray/v2ray-core/transport/internet"
"v2ray.com/core/app"
"v2ray.com/core/app/dispatcher"
dispatchers "v2ray.com/core/app/dispatcher/impl"
. "v2ray.com/core/app/dns"
"v2ray.com/core/app/proxyman"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/proxy"
"v2ray.com/core/proxy/freedom"
"v2ray.com/core/testing/assert"
"v2ray.com/core/transport/internet"
)
func TestDnsAdd(t *testing.T) {

View File

@ -3,8 +3,8 @@ package proxyman
import (
"sync"
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/proxy"
"v2ray.com/core/app"
"v2ray.com/core/proxy"
)
const (

View File

@ -1,7 +1,7 @@
package router
import (
"github.com/v2ray/v2ray-core/common"
"v2ray.com/core/common"
)
type ConfigObjectCreator func([]byte) (interface{}, error)

View File

@ -5,7 +5,7 @@ package router
import (
"encoding/json"
"github.com/v2ray/v2ray-core/common/log"
"v2ray.com/core/common/log"
)
func (this *Config) UnmarshalJSON(data []byte) error {

View File

@ -1,10 +1,10 @@
package router
import (
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/common"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
"v2ray.com/core/app"
"v2ray.com/core/common"
"v2ray.com/core/common/log"
v2net "v2ray.com/core/common/net"
)
const (

View File

@ -13,7 +13,7 @@ import (
"strconv"
"strings"
v2net "github.com/v2ray/v2ray-core/common/net"
v2net "v2ray.com/core/common/net"
)
const (
@ -65,7 +65,7 @@ func main() {
fmt.Fprintln(file, "package rules")
fmt.Fprintln(file, "import (")
fmt.Fprintln(file, "v2net \"github.com/v2ray/v2ray-core/common/net\"")
fmt.Fprintln(file, "v2net \"v2ray.com/core/common/net\"")
fmt.Fprintln(file, ")")
fmt.Fprintln(file, "var (")

View File

@ -1,7 +1,7 @@
package rules
import (
v2net "github.com/v2ray/v2ray-core/common/net"
v2net "v2ray.com/core/common/net"
)
var (

View File

@ -5,7 +5,7 @@ package rules
import (
"encoding/json"
"github.com/v2ray/v2ray-core/common/log"
"v2ray.com/core/common/log"
)
func parseChinaIPRule(data []byte) (*Rule, error) {

View File

@ -5,8 +5,8 @@ package rules_test
import (
"testing"
. "github.com/v2ray/v2ray-core/app/router/rules"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/app/router/rules"
"v2ray.com/core/testing/assert"
)
func TestChinaIPJson(t *testing.T) {

View File

@ -4,9 +4,9 @@ import (
"net"
"testing"
. "github.com/v2ray/v2ray-core/app/router/rules"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/app/router/rules"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func makeDestination(ip string) v2net.Destination {

View File

@ -4,7 +4,7 @@ package rules
import (
"encoding/json"
"github.com/v2ray/v2ray-core/common/log"
"v2ray.com/core/common/log"
)
func parseChinaSitesRule(data []byte) (*Rule, error) {

View File

@ -5,8 +5,8 @@ package rules_test
import (
"testing"
. "github.com/v2ray/v2ray-core/app/router/rules"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/app/router/rules"
"v2ray.com/core/testing/assert"
)
func TestChinaSitesJson(t *testing.T) {

View File

@ -3,9 +3,9 @@ package rules_test
import (
"testing"
. "github.com/v2ray/v2ray-core/app/router/rules"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/app/router/rules"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func makeDomainDestination(domain string) v2net.Destination {

View File

@ -5,7 +5,7 @@ import (
"regexp"
"strings"
v2net "github.com/v2ray/v2ray-core/common/net"
v2net "v2ray.com/core/common/net"
)
type Condition interface {

View File

@ -1,7 +1,7 @@
package rules
import (
v2net "github.com/v2ray/v2ray-core/common/net"
v2net "v2ray.com/core/common/net"
)
type Rule struct {

View File

@ -7,10 +7,10 @@ import (
"errors"
"strings"
router "github.com/v2ray/v2ray-core/app/router"
"github.com/v2ray/v2ray-core/common/collect"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
router "v2ray.com/core/app/router"
"v2ray.com/core/common/collect"
"v2ray.com/core/common/log"
v2net "v2ray.com/core/common/net"
)
type JsonRule struct {

View File

@ -5,9 +5,9 @@ package rules_test
import (
"testing"
. "github.com/v2ray/v2ray-core/app/router/rules"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/app/router/rules"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func TestDomainRule(t *testing.T) {

View File

@ -3,11 +3,11 @@ package rules
import (
"errors"
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/app/dns"
"github.com/v2ray/v2ray-core/app/router"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
"v2ray.com/core/app"
"v2ray.com/core/app/dns"
"v2ray.com/core/app/router"
"v2ray.com/core/common/log"
v2net "v2ray.com/core/common/net"
)
var (

View File

@ -3,15 +3,15 @@ package rules_test
import (
"testing"
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/app/dispatcher"
dispatchers "github.com/v2ray/v2ray-core/app/dispatcher/impl"
"github.com/v2ray/v2ray-core/app/dns"
"github.com/v2ray/v2ray-core/app/proxyman"
"github.com/v2ray/v2ray-core/app/router"
. "github.com/v2ray/v2ray-core/app/router/rules"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
"v2ray.com/core/app"
"v2ray.com/core/app/dispatcher"
dispatchers "v2ray.com/core/app/dispatcher/impl"
"v2ray.com/core/app/dns"
"v2ray.com/core/app/proxyman"
"v2ray.com/core/app/router"
. "v2ray.com/core/app/router/rules"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func TestSimpleRouter(t *testing.T) {

View File

@ -3,7 +3,7 @@ package app
import (
"errors"
"github.com/v2ray/v2ray-core/common"
"v2ray.com/core/common"
)
var (

View File

@ -5,7 +5,7 @@ import (
"hash"
"io"
"github.com/v2ray/v2ray-core/common/serial"
"v2ray.com/core/common/serial"
)
const (

View File

@ -3,8 +3,8 @@ package alloc_test
import (
"testing"
. "github.com/v2ray/v2ray-core/common/alloc"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/common/alloc"
"v2ray.com/core/testing/assert"
)
func TestBufferClear(t *testing.T) {

View File

@ -6,8 +6,8 @@ import (
"encoding/json"
"testing"
. "github.com/v2ray/v2ray-core/common/collect"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/common/collect"
"v2ray.com/core/testing/assert"
)
func TestStringListUnmarshalError(t *testing.T) {

View File

@ -4,7 +4,7 @@ import (
"crypto/cipher"
"testing"
. "github.com/v2ray/v2ray-core/common/crypto"
. "v2ray.com/core/common/crypto"
)
const benchSize = 1024 * 1024

View File

@ -3,7 +3,7 @@ package crypto
import (
"crypto/cipher"
"github.com/v2ray/v2ray-core/common/crypto/internal"
"v2ray.com/core/common/crypto/internal"
)
// NewChaCha20Stream creates a new Chacha20 encryption/descryption stream based on give key and IV.

View File

@ -5,8 +5,8 @@ import (
"encoding/hex"
"testing"
. "github.com/v2ray/v2ray-core/common/crypto"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/common/crypto"
"v2ray.com/core/testing/assert"
)
func mustDecodeHex(s string) []byte {

View File

@ -4,7 +4,7 @@ import (
"crypto/cipher"
"io"
"github.com/v2ray/v2ray-core/common"
"v2ray.com/core/common"
)
type CryptionReader struct {

View File

@ -4,7 +4,7 @@ import (
"io"
"sync"
"github.com/v2ray/v2ray-core/common/alloc"
"v2ray.com/core/common/alloc"
)
type BufferedReader struct {

View File

@ -3,9 +3,9 @@ package io_test
import (
"testing"
"github.com/v2ray/v2ray-core/common/alloc"
. "github.com/v2ray/v2ray-core/common/io"
"github.com/v2ray/v2ray-core/testing/assert"
"v2ray.com/core/common/alloc"
. "v2ray.com/core/common/io"
"v2ray.com/core/testing/assert"
)
func TestBufferedReader(t *testing.T) {

View File

@ -4,7 +4,7 @@ import (
"io"
"sync"
"github.com/v2ray/v2ray-core/common/alloc"
"v2ray.com/core/common/alloc"
)
type BufferedWriter struct {

View File

@ -3,9 +3,9 @@ package io_test
import (
"testing"
"github.com/v2ray/v2ray-core/common/alloc"
. "github.com/v2ray/v2ray-core/common/io"
"github.com/v2ray/v2ray-core/testing/assert"
"v2ray.com/core/common/alloc"
. "v2ray.com/core/common/io"
"v2ray.com/core/testing/assert"
)
func TestBufferedWriter(t *testing.T) {

View File

@ -4,7 +4,7 @@ import (
"io"
"sync"
"github.com/v2ray/v2ray-core/common/alloc"
"v2ray.com/core/common/alloc"
)
type ChainWriter struct {

View File

@ -4,7 +4,7 @@ import (
"io"
"sync"
"github.com/v2ray/v2ray-core/common/alloc"
"v2ray.com/core/common/alloc"
)
type ChanReader struct {

View File

@ -3,8 +3,8 @@ package io
import (
"io"
"github.com/v2ray/v2ray-core/common"
"github.com/v2ray/v2ray-core/common/alloc"
"v2ray.com/core/common"
"v2ray.com/core/common/alloc"
)
// Reader extends io.Reader with alloc.Buffer.

View File

@ -4,9 +4,9 @@ import (
"bytes"
"testing"
"github.com/v2ray/v2ray-core/common/alloc"
. "github.com/v2ray/v2ray-core/common/io"
"github.com/v2ray/v2ray-core/testing/assert"
"v2ray.com/core/common/alloc"
. "v2ray.com/core/common/io"
"v2ray.com/core/testing/assert"
)
func TestAdaptiveReader(t *testing.T) {

View File

@ -1,7 +1,7 @@
package io
import (
"github.com/v2ray/v2ray-core/common/log"
"v2ray.com/core/common/log"
)
func Pipe(reader Reader, writer Writer) error {

View File

@ -3,8 +3,8 @@ package io
import (
"io"
"github.com/v2ray/v2ray-core/common"
"github.com/v2ray/v2ray-core/common/alloc"
"v2ray.com/core/common"
"v2ray.com/core/common/alloc"
)
// Writer extends io.Writer with alloc.Buffer.

View File

@ -5,9 +5,9 @@ import (
"crypto/rand"
"testing"
"github.com/v2ray/v2ray-core/common/alloc"
. "github.com/v2ray/v2ray-core/common/io"
"github.com/v2ray/v2ray-core/testing/assert"
"v2ray.com/core/common/alloc"
. "v2ray.com/core/common/io"
"v2ray.com/core/testing/assert"
)
func TestAdaptiveWriter(t *testing.T) {

View File

@ -5,8 +5,8 @@ package loader
import (
"encoding/json"
"github.com/v2ray/v2ray-core/common"
"github.com/v2ray/v2ray-core/common/log"
"v2ray.com/core/common"
"v2ray.com/core/common/log"
)
type JSONConfigLoader struct {

View File

@ -2,7 +2,7 @@ package loader
import (
"errors"
"github.com/v2ray/v2ray-core/common"
"v2ray.com/core/common"
)
var (

View File

@ -1,7 +1,7 @@
package log
import (
"github.com/v2ray/v2ray-core/common/log/internal"
"v2ray.com/core/common/log/internal"
)
// AccessStatus is the status of an access request from clients.

View File

@ -4,8 +4,8 @@ import (
"fmt"
"strings"
"github.com/v2ray/v2ray-core/common"
"github.com/v2ray/v2ray-core/common/serial"
"v2ray.com/core/common"
"v2ray.com/core/common/serial"
)
func InterfaceToString(value interface{}) string {

View File

@ -3,8 +3,8 @@ package internal_test
import (
"testing"
. "github.com/v2ray/v2ray-core/common/log/internal"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/common/log/internal"
"v2ray.com/core/testing/assert"
)
func TestAccessLog(t *testing.T) {

View File

@ -5,8 +5,8 @@ import (
"os"
"time"
"github.com/v2ray/v2ray-core/common/platform"
"github.com/v2ray/v2ray-core/common/signal"
"v2ray.com/core/common/platform"
"v2ray.com/core/common/signal"
)
type LogWriter interface {

View File

@ -1,7 +1,7 @@
package log
import (
"github.com/v2ray/v2ray-core/common/log/internal"
"v2ray.com/core/common/log/internal"
)
type LogLevel int

View File

@ -3,8 +3,8 @@ package net
import (
"net"
"github.com/v2ray/v2ray-core/common/log"
"github.com/v2ray/v2ray-core/common/predicate"
"v2ray.com/core/common/log"
"v2ray.com/core/common/predicate"
)
var (

View File

@ -7,8 +7,8 @@ import (
"net"
"testing"
. "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func TestIPParsing(t *testing.T) {

View File

@ -4,8 +4,8 @@ import (
"net"
"testing"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func TestIPv4Address(t *testing.T) {

View File

@ -3,8 +3,8 @@ package net_test
import (
"testing"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func TestTCPDestination(t *testing.T) {

View File

@ -4,8 +4,8 @@ import (
"net"
"testing"
. "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func parseCIDR(str string) *net.IPNet {

View File

@ -3,7 +3,7 @@ package net
import (
"strings"
"github.com/v2ray/v2ray-core/common/collect"
"v2ray.com/core/common/collect"
)
const (

View File

@ -5,7 +5,7 @@ package net
import (
"encoding/json"
"github.com/v2ray/v2ray-core/common/collect"
"v2ray.com/core/common/collect"
)
func (this *NetworkList) UnmarshalJSON(data []byte) error {

View File

@ -6,8 +6,8 @@ import (
"encoding/json"
"testing"
. "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func TestArrayNetworkList(t *testing.T) {

View File

@ -4,7 +4,7 @@ import (
"errors"
"strconv"
"github.com/v2ray/v2ray-core/common/serial"
"v2ray.com/core/common/serial"
)
var (

View File

@ -6,7 +6,7 @@ import (
"encoding/json"
"strings"
"github.com/v2ray/v2ray-core/common/log"
"v2ray.com/core/common/log"
)
func parseIntPort(data []byte) (Port, error) {

View File

@ -6,8 +6,8 @@ import (
"encoding/json"
"testing"
. "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func TestIntPort(t *testing.T) {

View File

@ -3,8 +3,8 @@ package net_test
import (
"testing"
. "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func TestPortRangeContains(t *testing.T) {

View File

@ -3,8 +3,8 @@ package net_test
import (
"testing"
. "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/common/net"
"v2ray.com/core/testing/assert"
)
func TestTimeOutSettings(t *testing.T) {

View File

@ -1,8 +1,8 @@
package protocol
import (
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/common/uuid"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/common/uuid"
)
type RequestCommand byte

View File

@ -3,8 +3,8 @@ package protocol_test
import (
"testing"
. "github.com/v2ray/v2ray-core/common/protocol"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/common/protocol"
"v2ray.com/core/testing/assert"
)
func TestRequestOptionSet(t *testing.T) {

View File

@ -6,7 +6,7 @@ import (
"errors"
"hash"
"github.com/v2ray/v2ray-core/common/uuid"
"v2ray.com/core/common/uuid"
)
const (

View File

@ -3,10 +3,10 @@ package protocol_test
import (
"testing"
"github.com/v2ray/v2ray-core/common/predicate"
. "github.com/v2ray/v2ray-core/common/protocol"
"github.com/v2ray/v2ray-core/common/uuid"
"github.com/v2ray/v2ray-core/testing/assert"
"v2ray.com/core/common/predicate"
. "v2ray.com/core/common/protocol"
"v2ray.com/core/common/uuid"
"v2ray.com/core/testing/assert"
)
func TestCmdKey(t *testing.T) {

View File

@ -4,9 +4,9 @@ import (
"testing"
"time"
v2net "github.com/v2ray/v2ray-core/common/net"
. "github.com/v2ray/v2ray-core/common/protocol"
"github.com/v2ray/v2ray-core/testing/assert"
v2net "v2ray.com/core/common/net"
. "v2ray.com/core/common/protocol"
"v2ray.com/core/testing/assert"
)
func TestServerList(t *testing.T) {

View File

@ -4,8 +4,8 @@ import (
"sync"
"time"
"github.com/v2ray/v2ray-core/common/dice"
v2net "github.com/v2ray/v2ray-core/common/net"
"v2ray.com/core/common/dice"
v2net "v2ray.com/core/common/net"
)
type ValidationStrategy interface {

View File

@ -4,9 +4,9 @@ import (
"testing"
"time"
v2net "github.com/v2ray/v2ray-core/common/net"
. "github.com/v2ray/v2ray-core/common/protocol"
"github.com/v2ray/v2ray-core/testing/assert"
v2net "v2ray.com/core/common/net"
. "v2ray.com/core/common/protocol"
"v2ray.com/core/testing/assert"
)
type TestAccount struct {

View File

@ -3,8 +3,8 @@ package protocol
import (
"time"
"github.com/v2ray/v2ray-core/common/dice"
"github.com/v2ray/v2ray-core/common/serial"
"v2ray.com/core/common/dice"
"v2ray.com/core/common/serial"
)
type Timestamp int64

View File

@ -4,8 +4,8 @@ import (
"testing"
"time"
. "github.com/v2ray/v2ray-core/common/protocol"
"github.com/v2ray/v2ray-core/testing/assert"
. "v2ray.com/core/common/protocol"
"v2ray.com/core/testing/assert"
)
func TestGenerateRandomInt64InRange(t *testing.T) {

View File

@ -6,8 +6,8 @@ import (
"encoding/json"
"testing"