diff --git a/docs/design/dd-008-richer-input.md b/docs/design/dd-008-richer-input.md index 2529b9ef4..6590fcbd0 100644 --- a/docs/design/dd-008-richer-input.md +++ b/docs/design/dd-008-richer-input.md @@ -450,7 +450,7 @@ of them were available. In [#1620](https://github.com/ooni/probe-cli/pull/1620), we started to modify the `./pkg/oonimkall` package to support richer input. -Before this diff, the code was not using a loader for loading inputs +Before this diff, the code was not using a loader for loading targets for experiments, and the code roughly looked like this: ```Go diff --git a/internal/targetloading/targetloading.go b/internal/targetloading/targetloading.go index bdddb675f..dc9162354 100644 --- a/internal/targetloading/targetloading.go +++ b/internal/targetloading/targetloading.go @@ -215,10 +215,10 @@ var dnsCheckDefaultInput = []string{ var stunReachabilityDefaultInput = stuninput.AsnStunReachabilityInput() -// StaticBareInputForExperiment returns the list of strings an +// staticBareInputForExperiment returns the list of strings an // experiment should use as static input. In case there is no // static input for this experiment, we return an error. -func StaticBareInputForExperiment(name string) ([]string, error) { +func staticBareInputForExperiment(name string) ([]string, error) { // Implementation note: we may be called from pkg/oonimkall // with a non-canonical experiment name, so we need to convert // the experiment name to be canonical before proceeding. @@ -239,7 +239,7 @@ func StaticBareInputForExperiment(name string) ([]string, error) { // staticInputForExperiment returns the static input for the given experiment // or an error if there's no static input for the experiment. func staticInputForExperiment(name string) ([]model.ExperimentTarget, error) { - return stringListToModelExperimentTarget(StaticBareInputForExperiment(name)) + return stringListToModelExperimentTarget(staticBareInputForExperiment(name)) } // loadOrStaticDefault implements the InputOrStaticDefault policy. @@ -364,15 +364,6 @@ func (il *Loader) checkIn( return &reply.Tests, nil } -// fetchOpenVPNConfig fetches vpn information for the configured providers -func (il *Loader) fetchOpenVPNConfig(ctx context.Context, provider string) (*model.OOAPIVPNProviderConfig, error) { - reply, err := il.Session.FetchOpenVPNConfig(ctx, provider, "XX") - if err != nil { - return nil, err - } - return reply, nil -} - // preventMistakes makes the code more robust with respect to any possible // integration issue where the backend returns to us URLs that don't // belong to the category codes we requested.