d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
72 lines
1.3 KiB
Go
72 lines
1.3 KiB
Go
package dialer
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"net"
|
|
"time"
|
|
)
|
|
|
|
type FakeDialer struct {
|
|
Conn net.Conn
|
|
Err error
|
|
}
|
|
|
|
func (d FakeDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
return d.Conn, d.Err
|
|
}
|
|
|
|
type FakeConn struct {
|
|
ReadError error
|
|
ReadData []byte
|
|
SetDeadlineError error
|
|
SetReadDeadlineError error
|
|
SetWriteDeadlineError error
|
|
WriteError error
|
|
}
|
|
|
|
func (c *FakeConn) Read(b []byte) (int, error) {
|
|
if len(c.ReadData) > 0 {
|
|
n := copy(b, c.ReadData)
|
|
c.ReadData = c.ReadData[n:]
|
|
return n, nil
|
|
}
|
|
if c.ReadError != nil {
|
|
return 0, c.ReadError
|
|
}
|
|
return 0, io.EOF
|
|
}
|
|
|
|
func (c *FakeConn) Write(b []byte) (n int, err error) {
|
|
if c.WriteError != nil {
|
|
return 0, c.WriteError
|
|
}
|
|
n = len(b)
|
|
return
|
|
}
|
|
|
|
func (*FakeConn) Close() (err error) {
|
|
return
|
|
}
|
|
|
|
func (*FakeConn) LocalAddr() net.Addr {
|
|
return &net.TCPAddr{}
|
|
}
|
|
|
|
func (*FakeConn) RemoteAddr() net.Addr {
|
|
return &net.TCPAddr{}
|
|
}
|
|
|
|
func (c *FakeConn) SetDeadline(t time.Time) (err error) {
|
|
return c.SetDeadlineError
|
|
}
|
|
|
|
func (c *FakeConn) SetReadDeadline(t time.Time) (err error) {
|
|
return c.SetReadDeadlineError
|
|
}
|
|
|
|
func (c *FakeConn) SetWriteDeadline(t time.Time) (err error) {
|
|
return c.SetWriteDeadlineError
|
|
}
|