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

fix test break

pull/27/head
V2Ray 2015-09-17 23:29:12 +02:00
parent 55377d5ad5
commit 7d92b6a4fb
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
io/vmess/vmess_test.go
View File

@ -3,7 +3,6 @@ package vmess
import ( import (
"bytes" "bytes"
"crypto/rand" "crypto/rand"
"io/ioutil"
"testing" "testing"
"github.com/v2ray/v2ray-core" "github.com/v2ray/v2ray-core"
@ -47,19 +46,17 @@ func TestVMessSerialization(t *testing.T) {
request.Command = byte(0x01) request.Command = byte(0x01)
request.Address = v2net.DomainAddress("v2ray.com", 80) request.Address = v2net.DomainAddress("v2ray.com", 80)
buffer := bytes.NewBuffer(make([]byte, 0, 300))
mockTime := int64(1823730) mockTime := int64(1823730)
requestWriter := NewVMessRequestWriter(v2hash.NewTimeHash(v2hash.HMACHash{}), func(base int64, delta int) int64 { return mockTime }) buffer, err := request.ToBytes(v2hash.NewTimeHash(v2hash.HMACHash{}), func(base int64, delta int) int64 { return mockTime })
err = requestWriter.Write(buffer, request)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
userSet.UserHashes[string(buffer.Bytes()[:16])] = 0 userSet.UserHashes[string(buffer[:16])] = 0
userSet.Timestamps[string(buffer.Bytes()[:16])] = mockTime userSet.Timestamps[string(buffer[:16])] = mockTime
requestReader := NewVMessRequestReader(&userSet) requestReader := NewVMessRequestReader(&userSet)
actualRequest, err := requestReader.Read(buffer) actualRequest, err := requestReader.Read(bytes.NewReader(buffer))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -89,8 +86,7 @@ func BenchmarkVMessRequestWriting(b *testing.B) {
request.Command = byte(0x01) request.Command = byte(0x01)
request.Address = v2net.DomainAddress("v2ray.com", 80) request.Address = v2net.DomainAddress("v2ray.com", 80)
requestWriter := NewVMessRequestWriter(v2hash.NewTimeHash(v2hash.HMACHash{}), v2math.GenerateRandomInt64InRange)
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
requestWriter.Write(ioutil.Discard, request) request.ToBytes(v2hash.NewTimeHash(v2hash.HMACHash{}), v2math.GenerateRandomInt64InRange)
} }
} }