github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

format import

pull/2034/head
v2ray 2016-08-17 23:14:13 +02:00
parent 8ecec9b49d
commit d9884b4010
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
transport/internet/ws/ws_test.go
View File

@ -4,11 +4,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/v2ray/v2ray-core/testing/assert"
. "github.com/v2ray/v2ray-core/transport/internet/ws"
v2net "github.com/v2ray/v2ray-core/common/net" v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/testing/assert"
. "github.com/v2ray/v2ray-core/transport/internet/ws"
) )
func Test_Connect_ws(t *testing.T) { func Test_Connect_ws(t *testing.T) {

3
transport/internet/ws/wsconn.go
View File

@ -7,9 +7,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/v2ray/v2ray-core/common/log"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/v2ray/v2ray-core/common/log"
) )
type wsconn struct { type wsconn struct {