lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-22 21:49:10 -04:00
Code Issues Releases Wiki Activity

move fundamental interfaces from vmess to common

Browse Source
This commit is contained in:
v2ray
2016-02-03 11:58:42 +01:00
parent e8b0505c01
commit 2147ba5ab3
19 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/vmess/vmess_test.go
View File

@@ -8,11 +8,11 @@ import (
"github.com/v2ray/v2ray-core/app/dispatcher"
v2net "github.com/v2ray/v2ray-core/common/net"
v2nettesting "github.com/v2ray/v2ray-core/common/net/testing"
proto "github.com/v2ray/v2ray-core/common/protocol"
"github.com/v2ray/v2ray-core/common/uuid"
"github.com/v2ray/v2ray-core/proxy"
proxytesting "github.com/v2ray/v2ray-core/proxy/testing"
proxymocks "github.com/v2ray/v2ray-core/proxy/testing/mocks"
vmess "github.com/v2ray/v2ray-core/proxy/vmess"
_ "github.com/v2ray/v2ray-core/proxy/vmess/inbound"
_ "github.com/v2ray/v2ray-core/proxy/vmess/outbound"
"github.com/v2ray/v2ray-core/shell/point"
@@ -26,7 +26,7 @@ func TestVMessInAndOut(t *testing.T) {
id, err := uuid.ParseString("ad937d9d-6e23-4a5a-ba23-bce5092a7c51")
assert.Error(err).IsNil()
testAccount := vmess.NewID(id)
testAccount := proto.NewID(id)
portA := v2nettesting.PickPort()
portB := v2nettesting.PickPort()