diff --git a/internal/experiment/dash/measurer.go b/internal/experiment/dash/measurer.go index 78904ed479..9174cb79c2 100644 --- a/internal/experiment/dash/measurer.go +++ b/internal/experiment/dash/measurer.go @@ -10,9 +10,9 @@ import ( "net/http" "github.com/ooni/probe-cli/v3/internal/legacy/netx" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // Config contains the experiment config. diff --git a/internal/experiment/dash/runner.go b/internal/experiment/dash/runner.go index 6467d797a1..59f1c6215e 100644 --- a/internal/experiment/dash/runner.go +++ b/internal/experiment/dash/runner.go @@ -14,9 +14,9 @@ import ( "github.com/montanaflynn/stats" "github.com/ooni/probe-cli/v3/internal/humanize" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // runnerConfig contains settings for running the dash experiment. This struct diff --git a/internal/experiment/dash/runner_test.go b/internal/experiment/dash/runner_test.go index 797aef76d1..1d9ce148dc 100644 --- a/internal/experiment/dash/runner_test.go +++ b/internal/experiment/dash/runner_test.go @@ -10,9 +10,9 @@ import ( "time" "github.com/apex/log" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/mocks" "github.com/ooni/probe-cli/v3/internal/model" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestRunnerRunAllPhasesLocateFailure(t *testing.T) { diff --git a/internal/experiment/dnscheck/dnscheck.go b/internal/experiment/dnscheck/dnscheck.go index ff4c778d32..abbe4ee33f 100644 --- a/internal/experiment/dnscheck/dnscheck.go +++ b/internal/experiment/dnscheck/dnscheck.go @@ -16,9 +16,9 @@ import ( "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/legacy/netx" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/fbmessenger/fbmessenger_test.go b/internal/experiment/fbmessenger/fbmessenger_test.go index 945aafe4a1..2347453f67 100644 --- a/internal/experiment/fbmessenger/fbmessenger_test.go +++ b/internal/experiment/fbmessenger/fbmessenger_test.go @@ -11,12 +11,12 @@ import ( "github.com/ooni/netem" "github.com/ooni/probe-cli/v3/internal/experiment/fbmessenger" "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/mocks" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netemx" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/runtimex" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // servicesAddr is the IP address implementing al fbmessenger services in netem-based tests diff --git a/internal/experiment/hhfm/hhfm.go b/internal/experiment/hhfm/hhfm.go index 500d0b8914..44d9afa4f1 100644 --- a/internal/experiment/hhfm/hhfm.go +++ b/internal/experiment/hhfm/hhfm.go @@ -15,10 +15,10 @@ import ( "time" "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/randx" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/hhfm/hhfm_test.go b/internal/experiment/hhfm/hhfm_test.go index 951f148f56..43897ddaae 100644 --- a/internal/experiment/hhfm/hhfm_test.go +++ b/internal/experiment/hhfm/hhfm_test.go @@ -16,9 +16,9 @@ import ( "github.com/ooni/probe-cli/v3/internal/experiment/hhfm" "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/legacy/mockable" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestNewExperimentMeasurer(t *testing.T) { diff --git a/internal/experiment/hirl/hirl.go b/internal/experiment/hirl/hirl.go index 0c8c8a63c0..8e1938944b 100644 --- a/internal/experiment/hirl/hirl.go +++ b/internal/experiment/hirl/hirl.go @@ -12,10 +12,10 @@ import ( "time" "github.com/ooni/probe-cli/v3/internal/legacy/netx" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/randx" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/hirl/hirl_test.go b/internal/experiment/hirl/hirl_test.go index 7d9f55bd49..7685261419 100644 --- a/internal/experiment/hirl/hirl_test.go +++ b/internal/experiment/hirl/hirl_test.go @@ -10,9 +10,9 @@ import ( "github.com/ooni/probe-cli/v3/internal/experiment/hirl" "github.com/ooni/probe-cli/v3/internal/legacy/mockable" "github.com/ooni/probe-cli/v3/internal/legacy/netx" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestNewExperimentMeasurer(t *testing.T) { diff --git a/internal/experiment/quicping/quicping.go b/internal/experiment/quicping/quicping.go index 2e048324fd..4061b35e26 100644 --- a/internal/experiment/quicping/quicping.go +++ b/internal/experiment/quicping/quicping.go @@ -17,8 +17,8 @@ import ( _ "crypto/sha256" - "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/model" ) // A connectionID in QUIC diff --git a/internal/experiment/riseupvpn/riseupvpn.go b/internal/experiment/riseupvpn/riseupvpn.go index 180e614061..c0447926f1 100644 --- a/internal/experiment/riseupvpn/riseupvpn.go +++ b/internal/experiment/riseupvpn/riseupvpn.go @@ -10,9 +10,9 @@ import ( "time" "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/riseupvpn/riseupvpn_test.go b/internal/experiment/riseupvpn/riseupvpn_test.go index 5ef3f3c375..98dc8768c9 100644 --- a/internal/experiment/riseupvpn/riseupvpn_test.go +++ b/internal/experiment/riseupvpn/riseupvpn_test.go @@ -15,9 +15,9 @@ import ( "github.com/ooni/probe-cli/v3/internal/experiment/riseupvpn" "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/legacy/mockable" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/stunreachability/stunreachability.go b/internal/experiment/stunreachability/stunreachability.go index c13b6a596f..9e4e602a2f 100644 --- a/internal/experiment/stunreachability/stunreachability.go +++ b/internal/experiment/stunreachability/stunreachability.go @@ -11,9 +11,9 @@ import ( "time" "github.com/ooni/probe-cli/v3/internal/legacy/netx" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/pion/stun" ) diff --git a/internal/experiment/tlsmiddlebox/trace.go b/internal/experiment/tlsmiddlebox/trace.go index 972a8343fb..a3fbae9b26 100644 --- a/internal/experiment/tlsmiddlebox/trace.go +++ b/internal/experiment/tlsmiddlebox/trace.go @@ -3,8 +3,8 @@ package tlsmiddlebox import ( "sync" - "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/model" ) // CompleteTrace records the result of the network trace diff --git a/internal/experiment/tlstool/tlstool.go b/internal/experiment/tlstool/tlstool.go index cd3cc6371b..33a8b6f11b 100644 --- a/internal/experiment/tlstool/tlstool.go +++ b/internal/experiment/tlstool/tlstool.go @@ -17,9 +17,9 @@ import ( "github.com/ooni/probe-cli/v3/internal/experiment/tlstool/internal" "github.com/ooni/probe-cli/v3/internal/legacy/netx" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/tor/tor.go b/internal/experiment/tor/tor.go index d0040c41b1..56a429dabc 100644 --- a/internal/experiment/tor/tor.go +++ b/internal/experiment/tor/tor.go @@ -14,11 +14,11 @@ import ( "time" "github.com/ooni/probe-cli/v3/internal/legacy/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "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/scrubber" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/tor/tor_test.go b/internal/experiment/tor/tor_test.go index b817f362d5..35be66c0aa 100644 --- a/internal/experiment/tor/tor_test.go +++ b/internal/experiment/tor/tor_test.go @@ -13,8 +13,8 @@ import ( "github.com/apex/log" "github.com/google/go-cmp/cmp" - "github.com/ooni/probe-cli/v3/internal/legacy/mockable" "github.com/ooni/probe-cli/v3/internal/legacy/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/mockable" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/scrubber" diff --git a/internal/experiment/torsf/torsf.go b/internal/experiment/torsf/torsf.go index 499f1b9c3d..b04d015353 100644 --- a/internal/experiment/torsf/torsf.go +++ b/internal/experiment/torsf/torsf.go @@ -11,11 +11,11 @@ import ( "time" "github.com/ooni/probe-cli/v3/internal/bytecounter" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/ptx" "github.com/ooni/probe-cli/v3/internal/runtimex" "github.com/ooni/probe-cli/v3/internal/torlogs" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/tunnel" ) diff --git a/internal/experiment/urlgetter/configurer.go b/internal/experiment/urlgetter/configurer.go index dd7d262d2d..ee1d510f5a 100644 --- a/internal/experiment/urlgetter/configurer.go +++ b/internal/experiment/urlgetter/configurer.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/ooni/probe-cli/v3/internal/legacy/netx" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // The Configurer job is to construct a Configuration that can diff --git a/internal/experiment/urlgetter/configurer_test.go b/internal/experiment/urlgetter/configurer_test.go index c74c949e07..44813ec1e6 100644 --- a/internal/experiment/urlgetter/configurer_test.go +++ b/internal/experiment/urlgetter/configurer_test.go @@ -9,8 +9,8 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" - "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/netxlite" ) func TestConfigurerNewConfigurationVanilla(t *testing.T) { diff --git a/internal/experiment/urlgetter/getter.go b/internal/experiment/urlgetter/getter.go index dc7a3122df..2d7931bbec 100644 --- a/internal/experiment/urlgetter/getter.go +++ b/internal/experiment/urlgetter/getter.go @@ -6,9 +6,9 @@ import ( "net/url" "time" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/tunnel" ) diff --git a/internal/experiment/urlgetter/urlgetter.go b/internal/experiment/urlgetter/urlgetter.go index 2c3bab09d8..f42a4a8ac4 100644 --- a/internal/experiment/urlgetter/urlgetter.go +++ b/internal/experiment/urlgetter/urlgetter.go @@ -13,8 +13,8 @@ import ( "crypto/x509" "time" - "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/model" ) const ( diff --git a/internal/experiment/vanillator/vanillator.go b/internal/experiment/vanillator/vanillator.go index bac59671b0..8d342b1dc0 100644 --- a/internal/experiment/vanillator/vanillator.go +++ b/internal/experiment/vanillator/vanillator.go @@ -10,10 +10,10 @@ import ( "path" "time" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" "github.com/ooni/probe-cli/v3/internal/torlogs" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/tunnel" ) diff --git a/internal/experiment/webconnectivity/httpanalysis_test.go b/internal/experiment/webconnectivity/httpanalysis_test.go index c74a2b1c87..ddb1bb1f31 100644 --- a/internal/experiment/webconnectivity/httpanalysis_test.go +++ b/internal/experiment/webconnectivity/httpanalysis_test.go @@ -6,8 +6,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" - "github.com/ooni/probe-cli/v3/internal/randx" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/randx" ) func TestHTTPBodyLengthChecks(t *testing.T) { diff --git a/internal/experiment/webconnectivity/summary_test.go b/internal/experiment/webconnectivity/summary_test.go index 8d8313cd81..de6f58794c 100644 --- a/internal/experiment/webconnectivity/summary_test.go +++ b/internal/experiment/webconnectivity/summary_test.go @@ -6,8 +6,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" - "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/netxlite" ) func TestSummarize(t *testing.T) { diff --git a/internal/experiment/webconnectivity/webconnectivity.go b/internal/experiment/webconnectivity/webconnectivity.go index 1f66a52a0d..72b254237d 100644 --- a/internal/experiment/webconnectivity/webconnectivity.go +++ b/internal/experiment/webconnectivity/webconnectivity.go @@ -9,8 +9,8 @@ import ( "time" "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity/internal" - "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/model" ) const ( diff --git a/internal/experiment/webconnectivity/webconnectivity_test.go b/internal/experiment/webconnectivity/webconnectivity_test.go index fc9aa4f4fb..69fac2cf72 100644 --- a/internal/experiment/webconnectivity/webconnectivity_test.go +++ b/internal/experiment/webconnectivity/webconnectivity_test.go @@ -11,9 +11,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/ooni/probe-cli/v3/internal/engine" "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestNewExperimentMeasurer(t *testing.T) { diff --git a/internal/experiment/webconnectivitylte/testkeys.go b/internal/experiment/webconnectivitylte/testkeys.go index ec9ead7bb1..dd2e5be31a 100644 --- a/internal/experiment/webconnectivitylte/testkeys.go +++ b/internal/experiment/webconnectivitylte/testkeys.go @@ -12,8 +12,8 @@ import ( "sync" "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" - "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/model" ) // TestKeys contains the results produced by web_connectivity. diff --git a/internal/legacy/measurex/dnsx.go b/internal/legacy/measurex/dnsx.go index 6e6e45090a..2cc5b494b6 100644 --- a/internal/legacy/measurex/dnsx.go +++ b/internal/legacy/measurex/dnsx.go @@ -10,8 +10,8 @@ import ( "context" "time" - "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/model" ) // WrapDNSXRoundTripper creates a new DNSXRoundTripper that diff --git a/internal/legacy/measurex/resolver.go b/internal/legacy/measurex/resolver.go index 7aa24a8792..d546980516 100644 --- a/internal/legacy/measurex/resolver.go +++ b/internal/legacy/measurex/resolver.go @@ -11,9 +11,9 @@ import ( "strings" "time" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // WrapResolver creates a new Resolver that saves events into the WritableDB. diff --git a/internal/legacy/netx/config.go b/internal/legacy/netx/config.go index 5f61664455..11dade3bfe 100644 --- a/internal/legacy/netx/config.go +++ b/internal/legacy/netx/config.go @@ -9,8 +9,8 @@ import ( "net/url" "github.com/ooni/probe-cli/v3/internal/bytecounter" - "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/model" ) // Config contains configuration for creating new transports, dialers, etc. When diff --git a/internal/legacy/netx/dnstransport_test.go b/internal/legacy/netx/dnstransport_test.go index 15eca0aece..f419af617d 100644 --- a/internal/legacy/netx/dnstransport_test.go +++ b/internal/legacy/netx/dnstransport_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/netxlite" ) func TestNewDNSClientInvalidURL(t *testing.T) { diff --git a/internal/legacy/netx/http_test.go b/internal/legacy/netx/http_test.go index 9cf2d46df5..5e7d20cd86 100644 --- a/internal/legacy/netx/http_test.go +++ b/internal/legacy/netx/http_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "github.com/ooni/probe-cli/v3/internal/mocks" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/mocks" ) func TestNewHTTPTransportWithDialer(t *testing.T) { diff --git a/internal/legacy/netx/integration_test.go b/internal/legacy/netx/integration_test.go index e451b67b29..2310312ccf 100644 --- a/internal/legacy/netx/integration_test.go +++ b/internal/legacy/netx/integration_test.go @@ -7,8 +7,8 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/v3/internal/bytecounter" - "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/netxlite" ) func TestHTTPTransportWorkingAsIntended(t *testing.T) { diff --git a/internal/legacy/netx/resolver_test.go b/internal/legacy/netx/resolver_test.go index 29fce8a926..6e77aabdc1 100644 --- a/internal/legacy/netx/resolver_test.go +++ b/internal/legacy/netx/resolver_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/legacy/tracex" + "github.com/ooni/probe-cli/v3/internal/netxlite" ) func TestNewResolverBogonResolutionNotBroken(t *testing.T) { diff --git a/internal/legacy/netx/tls_test.go b/internal/legacy/netx/tls_test.go index 831d97ac8f..188fa79dd4 100644 --- a/internal/legacy/netx/tls_test.go +++ b/internal/legacy/netx/tls_test.go @@ -5,10 +5,10 @@ import ( "crypto/tls" "testing" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/runtimex" "github.com/ooni/probe-cli/v3/internal/testingx" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestNewTLSDialer(t *testing.T) { diff --git a/internal/oohelperd/dns.go b/internal/oohelperd/dns.go index 1b8cc70830..982b3241e5 100644 --- a/internal/oohelperd/dns.go +++ b/internal/oohelperd/dns.go @@ -9,10 +9,10 @@ import ( "sync" "time" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/logx" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // newfailure is a convenience shortcut to save typing. diff --git a/internal/oohelperd/http.go b/internal/oohelperd/http.go index cdfaed1aa9..e6867187ee 100644 --- a/internal/oohelperd/http.go +++ b/internal/oohelperd/http.go @@ -13,12 +13,12 @@ import ( "sync" "time" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/logx" "github.com/ooni/probe-cli/v3/internal/measurexlite" "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/legacy/tracex" ) // TODO(bassosimone): we should refactor the TH to use step-by-step such that we