566c6b246a
This diff addresses another point of https://github.com/ooni/probe/issues/1956: > - [ ] observe that we're still using a bunch of private interfaces for common interfaces such as the `Dialer`, so we can get rid of these private interfaces and always use the ones in `model`, which allows us to remove a bunch of legacy wrappers Additional cleanups may still be possible. The more I cleanup, the more I see there's extra legacy code we can dispose of (which seems good?).
60 lines
1.1 KiB
Go
60 lines
1.1 KiB
Go
package netx
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
)
|
|
|
|
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
|
|
}
|
|
|
|
func (d FakeDialer) CloseIdleConnections() {}
|
|
|
|
type FakeTransport struct {
|
|
Err error
|
|
Func func(*http.Request) (*http.Response, error)
|
|
Resp *http.Response
|
|
}
|
|
|
|
func (txp FakeTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
if txp.Func != nil {
|
|
return txp.Func(req)
|
|
}
|
|
if req.Body != nil {
|
|
netxlite.ReadAllContext(req.Context(), req.Body)
|
|
req.Body.Close()
|
|
}
|
|
if txp.Err != nil {
|
|
return nil, txp.Err
|
|
}
|
|
txp.Resp.Request = req // non thread safe but it doesn't matter
|
|
return txp.Resp, nil
|
|
}
|
|
|
|
func (txp FakeTransport) CloseIdleConnections() {}
|
|
|
|
type FakeBody struct {
|
|
Err error
|
|
}
|
|
|
|
func (fb FakeBody) Read(p []byte) (int, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
return 0, fb.Err
|
|
}
|
|
|
|
func (fb FakeBody) Close() error {
|
|
return nil
|
|
}
|