2e0118d1a6
## Description This PR continues the refactoring of `netx` under the following principles: 1. do not break the rest of the tree and do not engage in extensive tree-wide refactoring yet 2. move under `netxlite` clearly related subpackages (e.g., `iox`, `netxmocks`) 3. move into `internal/netxlite/internal` stuff that is clearly private of `netxlite` 4. hide implementation details in `netxlite` pending new factories 5. refactor `tls` code in `netxlite` to clearly separate `crypto/tls` code from `utls` code After each commit, I run `go test -short -race ./...` locally. Each individual commit explains what it does. I will squash, but this operation will preserve the original commit titles, so this will give further insight on each step. ## Commits * refactor: rename netxmocks -> netxlite/mocks Part of https://github.com/ooni/probe/issues/1591 * refactor: rename quicx -> netxlite/quicx See https://github.com/ooni/probe/issues/1591 * refactor: rename iox -> netxlite/iox Regenerate sources and make sure the tests pass. See https://github.com/ooni/probe/issues/1591. * refactor(iox): move MockableReader to netxlite/mocks See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): generator is an implementation detail See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): separate tls and utls code See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): hide most types but keep old names as legacy With this change we avoid breaking the rest of the tree, but we start hiding some implementation details a bit. Factories will follow. See https://github.com/ooni/probe/issues/1591
98 lines
1.7 KiB
Go
98 lines
1.7 KiB
Go
package ooapi
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
|
|
)
|
|
|
|
type FakeCodec struct {
|
|
DecodeErr error
|
|
EncodeData []byte
|
|
EncodeErr error
|
|
}
|
|
|
|
func (mc *FakeCodec) Encode(v interface{}) ([]byte, error) {
|
|
return mc.EncodeData, mc.EncodeErr
|
|
}
|
|
|
|
func (mc *FakeCodec) Decode(b []byte, v interface{}) error {
|
|
return mc.DecodeErr
|
|
}
|
|
|
|
type FakeHTTPClient struct {
|
|
Err error
|
|
Resp *http.Response
|
|
}
|
|
|
|
func (c *FakeHTTPClient) Do(req *http.Request) (*http.Response, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
if req.Body != nil {
|
|
_, _ = iox.ReadAllContext(req.Context(), req.Body)
|
|
req.Body.Close()
|
|
}
|
|
if c.Err != nil {
|
|
return nil, c.Err
|
|
}
|
|
c.Resp.Request = req // non thread safe but it doesn't matter
|
|
return c.Resp, nil
|
|
}
|
|
|
|
type FakeBody struct {
|
|
Data []byte
|
|
Err error
|
|
}
|
|
|
|
func (fb *FakeBody) Read(p []byte) (int, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
if fb.Err != nil {
|
|
return 0, fb.Err
|
|
}
|
|
if len(fb.Data) <= 0 {
|
|
return 0, io.EOF
|
|
}
|
|
n := copy(p, fb.Data)
|
|
fb.Data = fb.Data[n:]
|
|
return n, nil
|
|
}
|
|
|
|
func (fb *FakeBody) Close() error {
|
|
return nil
|
|
}
|
|
|
|
type FakeRequestMaker struct {
|
|
Req *http.Request
|
|
Err error
|
|
}
|
|
|
|
func (frm *FakeRequestMaker) NewRequest(
|
|
ctx context.Context, method, URL string, body io.Reader) (*http.Request, error) {
|
|
return frm.Req, frm.Err
|
|
}
|
|
|
|
type FakeTemplateExecutor struct {
|
|
Out string
|
|
Err error
|
|
}
|
|
|
|
func (fte *FakeTemplateExecutor) Execute(tmpl string, v interface{}) (string, error) {
|
|
return fte.Out, fte.Err
|
|
}
|
|
|
|
type FakeKVStore struct {
|
|
SetError error
|
|
GetData []byte
|
|
GetError error
|
|
}
|
|
|
|
func (fs *FakeKVStore) Get(key string) ([]byte, error) {
|
|
return fs.GetData, fs.GetError
|
|
}
|
|
|
|
func (fs *FakeKVStore) Set(key string, value []byte) error {
|
|
return fs.SetError
|
|
}
|