cleanup: remove redundant HTTPClient definition (#643)

This counts as a follow-up cleanup as part of doing
https://github.com/ooni/probe/issues/1885.
This commit is contained in:
Simone Basso
2022-01-03 16:47:54 +01:00
committed by GitHub
parent 273b70bacc
commit 43161a8138
9 changed files with 19 additions and 37 deletions
@@ -152,7 +152,7 @@ func (mx *Measurer) runAsync(ctx context.Context, sess model.ExperimentSession,
// URL measurement flow implemented by measurex.
type measurerMeasureURLHelper struct {
// Clnt is the MANDATORY client to use
Clnt measurex.HTTPClient
Clnt model.HTTPClient
// Logger is the MANDATORY Logger to use
Logger model.Logger
+3 -2
View File
@@ -19,6 +19,7 @@ import (
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/measurex"
"github.com/ooni/probe-cli/v3/internal/model"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/runtimex"
"github.com/ooni/probe-cli/v3/internal/version"
@@ -59,7 +60,7 @@ type THClient struct {
// HTTPClient is the MANDATORY HTTP client to
// use for contacting the TH.
HTTPClient measurex.HTTPClient
HTTPClient model.HTTPClient
// ServerURL is the MANDATORY URL of the TH HTTP endpoint.
ServerURL string
@@ -112,7 +113,7 @@ type THClientCall struct {
// HTTPClient is the MANDATORY HTTP client to
// use for contacting the TH.
HTTPClient measurex.HTTPClient
HTTPClient model.HTTPClient
// Header contains the MANDATORY request headers.
Header http.Header