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:
parent
de130d249c
commit
6d3a4f1db8
169 changed files with 575 additions and 671 deletions
|
|
@ -1,5 +1,5 @@
|
|||
// Code generated by go generate; DO NOT EDIT.
|
||||
// 2021-09-05 13:54:22.556115 +0200 CEST m=+0.000158543
|
||||
// 2021-09-28 12:05:23.599657 +0200 CEST m=+0.000196001
|
||||
|
||||
package ooapi
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ import (
|
|||
"io"
|
||||
"net/http"
|
||||
|
||||
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
|
||||
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
||||
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
|
||||
)
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ func (api *simpleCheckReportIDAPI) newResponse(ctx context.Context, resp *http.R
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
reader := io.LimitReader(resp.Body, 4<<20)
|
||||
data, err := iox.ReadAllContext(ctx, reader)
|
||||
data, err := netxlite.ReadAllContext(ctx, reader)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -49,7 +49,7 @@ func (api *simpleCheckInAPI) newResponse(ctx context.Context, resp *http.Respons
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
reader := io.LimitReader(resp.Body, 4<<20)
|
||||
data, err := iox.ReadAllContext(ctx, reader)
|
||||
data, err := netxlite.ReadAllContext(ctx, reader)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -72,7 +72,7 @@ func (api *simpleLoginAPI) newResponse(ctx context.Context, resp *http.Response,
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
reader := io.LimitReader(resp.Body, 4<<20)
|
||||
data, err := iox.ReadAllContext(ctx, reader)
|
||||
data, err := netxlite.ReadAllContext(ctx, reader)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -95,7 +95,7 @@ func (api *simpleMeasurementMetaAPI) newResponse(ctx context.Context, resp *http
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
reader := io.LimitReader(resp.Body, 4<<20)
|
||||
data, err := iox.ReadAllContext(ctx, reader)
|
||||
data, err := netxlite.ReadAllContext(ctx, reader)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -118,7 +118,7 @@ func (api *simpleRegisterAPI) newResponse(ctx context.Context, resp *http.Respon
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
reader := io.LimitReader(resp.Body, 4<<20)
|
||||
data, err := iox.ReadAllContext(ctx, reader)
|
||||
data, err := netxlite.ReadAllContext(ctx, reader)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -141,7 +141,7 @@ func (api *simpleTestHelpersAPI) newResponse(ctx context.Context, resp *http.Res
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
reader := io.LimitReader(resp.Body, 4<<20)
|
||||
data, err := iox.ReadAllContext(ctx, reader)
|
||||
data, err := netxlite.ReadAllContext(ctx, reader)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -167,7 +167,7 @@ func (api *simplePsiphonConfigAPI) newResponse(ctx context.Context, resp *http.R
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
reader := io.LimitReader(resp.Body, 4<<20)
|
||||
data, err := iox.ReadAllContext(ctx, reader)
|
||||
data, err := netxlite.ReadAllContext(ctx, reader)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -193,7 +193,7 @@ func (api *simpleTorTargetsAPI) newResponse(ctx context.Context, resp *http.Resp
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
reader := io.LimitReader(resp.Body, 4<<20)
|
||||
data, err := iox.ReadAllContext(ctx, reader)
|
||||
data, err := netxlite.ReadAllContext(ctx, reader)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -219,7 +219,7 @@ func (api *simpleURLsAPI) newResponse(ctx context.Context, resp *http.Response,
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
reader := io.LimitReader(resp.Body, 4<<20)
|
||||
data, err := iox.ReadAllContext(ctx, reader)
|
||||
data, err := netxlite.ReadAllContext(ctx, reader)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -242,7 +242,7 @@ func (api *simpleOpenReportAPI) newResponse(ctx context.Context, resp *http.Resp
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
reader := io.LimitReader(resp.Body, 4<<20)
|
||||
data, err := iox.ReadAllContext(ctx, reader)
|
||||
data, err := netxlite.ReadAllContext(ctx, reader)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -265,7 +265,7 @@ func (api *simpleSubmitMeasurementAPI) newResponse(ctx context.Context, resp *ht
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
reader := io.LimitReader(resp.Body, 4<<20)
|
||||
data, err := iox.ReadAllContext(ctx, reader)
|
||||
data, err := netxlite.ReadAllContext(ctx, reader)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue