refactor: merge dnsx and errorsx into netxlite (#517)
When preparing a tutorial for netxlite, I figured it is easier to tell people "hey, this is the package you should use for all low-level networking stuff" rather than introducing people to a set of packages working together where some piece of functionality is here and some other piece is there. Part of https://github.com/ooni/probe/issues/1591
This commit is contained in:
@@ -4,7 +4,7 @@ import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
|
||||
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
||||
)
|
||||
|
||||
type FakeTransport struct {
|
||||
@@ -19,7 +19,7 @@ func (txp FakeTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||
return txp.Func(req)
|
||||
}
|
||||
if req.Body != nil {
|
||||
iox.ReadAllContext(req.Context(), req.Body)
|
||||
netxlite.ReadAllContext(req.Context(), req.Body)
|
||||
req.Body.Close()
|
||||
}
|
||||
if txp.Err != nil {
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
"net/http"
|
||||
"net/url"
|
||||
|
||||
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
|
||||
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
||||
)
|
||||
|
||||
// Logger is the definition of Logger used by this package.
|
||||
@@ -101,7 +101,7 @@ func (c Client) Do(request *http.Request) ([]byte, error) {
|
||||
if response.StatusCode >= 400 {
|
||||
return nil, fmt.Errorf("httpx: request failed: %s", response.Status)
|
||||
}
|
||||
return iox.ReadAllContext(request.Context(), response.Body)
|
||||
return netxlite.ReadAllContext(request.Context(), response.Body)
|
||||
}
|
||||
|
||||
// DoJSON performs the provided request and unmarshals the JSON response body
|
||||
|
||||
Reference in New Issue
Block a user