1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-23 14:09:11 -04:00

remove dependency on assert lib

This commit is contained in:
Darien Raymond
2019-01-11 17:17:59 +01:00
parent 986c80fcda
commit 40796b9f9c
8 changed files with 108 additions and 379 deletions

View File

@@ -44,6 +44,17 @@ func readFrom(conn net.Conn, timeout time.Duration, length int) []byte {
return b[:n]
}
func readFrom2(conn net.Conn, timeout time.Duration, length int) ([]byte, error) {
b := make([]byte, length)
deadline := time.Now().Add(timeout)
conn.SetReadDeadline(deadline)
n, err := io.ReadFull(conn, b[:length])
if err != nil {
return nil, err
}
return b[:n], nil
}
func InitializeServerConfigs(configs ...*core.Config) ([]*exec.Cmd, error) {
servers := make([]*exec.Cmd, 0, 10)
@@ -160,7 +171,10 @@ func testTCPConn(port net.Port, payloadSize int, timeout time.Duration) func() e
return errors.New("expect ", len(payload), " written, but actually ", nBytes)
}
response := readFrom(conn, timeout, payloadSize)
response, err := readFrom2(conn, timeout, payloadSize)
if err != nil {
return err
}
if r := cmp.Diff(response, xor(payload)); r != "" {
return errors.New(r)
}