diff --git a/internal/engine/experiment/hhfm/hhfm.go b/internal/engine/experiment/hhfm/hhfm.go index db9e4e9..560b32f 100644 --- a/internal/engine/experiment/hhfm/hhfm.go +++ b/internal/engine/experiment/hhfm/hhfm.go @@ -16,10 +16,10 @@ import ( "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/engine/httpheader" + errorsxlegacy "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/model" "github.com/ooni/probe-cli/v3/internal/engine/netx/archival" "github.com/ooni/probe-cli/v3/internal/engine/netx/dialer" - errorsxlegacy "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite/iox" "github.com/ooni/probe-cli/v3/internal/randx" diff --git a/internal/engine/experiment/stunreachability/stunreachability.go b/internal/engine/experiment/stunreachability/stunreachability.go index 81f710a..5dadb1f 100644 --- a/internal/engine/experiment/stunreachability/stunreachability.go +++ b/internal/engine/experiment/stunreachability/stunreachability.go @@ -9,12 +9,12 @@ import ( "net" "time" + "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/model" "github.com/ooni/probe-cli/v3/internal/engine/netx" "github.com/ooni/probe-cli/v3/internal/engine/netx/archival" "github.com/ooni/probe-cli/v3/internal/engine/netx/dialer" "github.com/ooni/probe-cli/v3/internal/engine/netx/trace" - "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/pion/stun" ) diff --git a/internal/engine/experiment/urlgetter/getter.go b/internal/engine/experiment/urlgetter/getter.go index bcaeb94..9a658cd 100644 --- a/internal/engine/experiment/urlgetter/getter.go +++ b/internal/engine/experiment/urlgetter/getter.go @@ -6,10 +6,10 @@ import ( "net/url" "time" + legacyerrorsx "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/model" "github.com/ooni/probe-cli/v3/internal/engine/netx/archival" "github.com/ooni/probe-cli/v3/internal/engine/netx/trace" - legacyerrorsx "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite/errorsx" "github.com/ooni/probe-cli/v3/internal/tunnel" ) diff --git a/internal/engine/experiment/webconnectivity/control.go b/internal/engine/experiment/webconnectivity/control.go index 2abe148..e460ff1 100644 --- a/internal/engine/experiment/webconnectivity/control.go +++ b/internal/engine/experiment/webconnectivity/control.go @@ -5,8 +5,8 @@ import ( "github.com/ooni/probe-cli/v3/internal/engine/geolocate" "github.com/ooni/probe-cli/v3/internal/engine/httpx" + legacyerrorsx "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/model" - legacyerrorsx "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite/errorsx" ) diff --git a/internal/engine/experiment/websteps/control.go b/internal/engine/experiment/websteps/control.go index 37fe0ab..a333543 100644 --- a/internal/engine/experiment/websteps/control.go +++ b/internal/engine/experiment/websteps/control.go @@ -4,8 +4,8 @@ import ( "context" "github.com/ooni/probe-cli/v3/internal/engine/httpx" + errorsxlegacy "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/model" - errorsxlegacy "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite/errorsx" ) diff --git a/internal/engine/experiment/websteps/factory.go b/internal/engine/experiment/websteps/factory.go index bf929df..5c835fc 100644 --- a/internal/engine/experiment/websteps/factory.go +++ b/internal/engine/experiment/websteps/factory.go @@ -12,8 +12,8 @@ import ( "github.com/lucas-clemente/quic-go" "github.com/lucas-clemente/quic-go/http3" oohttp "github.com/ooni/oohttp" + "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/netx/quicdialer" - "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/errorsx/dialer.go b/internal/engine/legacy/errorsx/dialer.go similarity index 100% rename from internal/errorsx/dialer.go rename to internal/engine/legacy/errorsx/dialer.go diff --git a/internal/errorsx/dialer_test.go b/internal/engine/legacy/errorsx/dialer_test.go similarity index 100% rename from internal/errorsx/dialer_test.go rename to internal/engine/legacy/errorsx/dialer_test.go diff --git a/internal/errorsx/errorsx.go b/internal/engine/legacy/errorsx/errorsx.go similarity index 100% rename from internal/errorsx/errorsx.go rename to internal/engine/legacy/errorsx/errorsx.go diff --git a/internal/errorsx/errorsx_test.go b/internal/engine/legacy/errorsx/errorsx_test.go similarity index 100% rename from internal/errorsx/errorsx_test.go rename to internal/engine/legacy/errorsx/errorsx_test.go diff --git a/internal/errorsx/integration_test.go b/internal/engine/legacy/errorsx/integration_test.go similarity index 94% rename from internal/errorsx/integration_test.go rename to internal/engine/legacy/errorsx/integration_test.go index 832a975..2c183bf 100644 --- a/internal/errorsx/integration_test.go +++ b/internal/engine/legacy/errorsx/integration_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/lucas-clemente/quic-go" - errorsxlegacy "github.com/ooni/probe-cli/v3/internal/errorsx" + errorsxlegacy "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/netxlite/errorsx" ) diff --git a/internal/errorsx/quic.go b/internal/engine/legacy/errorsx/quic.go similarity index 100% rename from internal/errorsx/quic.go rename to internal/engine/legacy/errorsx/quic.go diff --git a/internal/errorsx/quic_test.go b/internal/engine/legacy/errorsx/quic_test.go similarity index 100% rename from internal/errorsx/quic_test.go rename to internal/engine/legacy/errorsx/quic_test.go diff --git a/internal/errorsx/resolver.go b/internal/engine/legacy/errorsx/resolver.go similarity index 100% rename from internal/errorsx/resolver.go rename to internal/engine/legacy/errorsx/resolver.go diff --git a/internal/errorsx/resolver_test.go b/internal/engine/legacy/errorsx/resolver_test.go similarity index 100% rename from internal/errorsx/resolver_test.go rename to internal/engine/legacy/errorsx/resolver_test.go diff --git a/internal/errorsx/tls.go b/internal/engine/legacy/errorsx/tls.go similarity index 100% rename from internal/errorsx/tls.go rename to internal/engine/legacy/errorsx/tls.go diff --git a/internal/errorsx/tls_test.go b/internal/engine/legacy/errorsx/tls_test.go similarity index 100% rename from internal/errorsx/tls_test.go rename to internal/engine/legacy/errorsx/tls_test.go diff --git a/internal/engine/legacy/netx/dialer.go b/internal/engine/legacy/netx/dialer.go index 2be290a..8329052 100644 --- a/internal/engine/legacy/netx/dialer.go +++ b/internal/engine/legacy/netx/dialer.go @@ -10,11 +10,11 @@ import ( "os" "time" + "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/handlers" "github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/modelx" "github.com/ooni/probe-cli/v3/internal/engine/netx/dialer" "github.com/ooni/probe-cli/v3/internal/engine/netx/tlsdialer" - "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite" ) diff --git a/internal/engine/legacy/netx/http.go b/internal/engine/legacy/netx/http.go index 01fa444..73dc7a1 100644 --- a/internal/engine/legacy/netx/http.go +++ b/internal/engine/legacy/netx/http.go @@ -5,10 +5,10 @@ import ( "net/url" "time" + errorsxlegacy "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/handlers" "github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/modelx" "github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/oldhttptransport" - errorsxlegacy "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite/errorsx" "golang.org/x/net/http2" ) diff --git a/internal/engine/legacy/netx/oldhttptransport/tracetripper.go b/internal/engine/legacy/netx/oldhttptransport/tracetripper.go index 71e31a3..569e478 100644 --- a/internal/engine/legacy/netx/oldhttptransport/tracetripper.go +++ b/internal/engine/legacy/netx/oldhttptransport/tracetripper.go @@ -11,8 +11,8 @@ import ( "time" "github.com/ooni/probe-cli/v3/internal/atomicx" + errorsxlegacy "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/modelx" - errorsxlegacy "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite/iox" ) diff --git a/internal/engine/legacy/netx/resolver.go b/internal/engine/legacy/netx/resolver.go index a522f7d..988ad32 100644 --- a/internal/engine/legacy/netx/resolver.go +++ b/internal/engine/legacy/netx/resolver.go @@ -9,10 +9,10 @@ import ( "sync" "time" + "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/handlers" "github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/modelx" "github.com/ooni/probe-cli/v3/internal/engine/netx/resolver" - "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite" ) diff --git a/internal/engine/netx/archival/archival.go b/internal/engine/netx/archival/archival.go index 2059442..09d8491 100644 --- a/internal/engine/netx/archival/archival.go +++ b/internal/engine/netx/archival/archival.go @@ -17,9 +17,9 @@ import ( "unicode/utf8" "github.com/ooni/probe-cli/v3/internal/engine/geolocate" + errorsxlegacy "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/model" "github.com/ooni/probe-cli/v3/internal/engine/netx/trace" - errorsxlegacy "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite/errorsx" ) diff --git a/internal/engine/netx/dialer/dialer.go b/internal/engine/netx/dialer/dialer.go index 276bf60..9fda79d 100644 --- a/internal/engine/netx/dialer/dialer.go +++ b/internal/engine/netx/dialer/dialer.go @@ -5,8 +5,8 @@ import ( "net" "net/url" + "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/netx/trace" - "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite" ) diff --git a/internal/engine/netx/dialer/dialer_test.go b/internal/engine/netx/dialer/dialer_test.go index 9535592..15fd200 100644 --- a/internal/engine/netx/dialer/dialer_test.go +++ b/internal/engine/netx/dialer/dialer_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/apex/log" + "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/netx/trace" - "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite" ) diff --git a/internal/engine/netx/netx.go b/internal/engine/netx/netx.go index 946e92c..71257ca 100644 --- a/internal/engine/netx/netx.go +++ b/internal/engine/netx/netx.go @@ -32,13 +32,13 @@ import ( "github.com/lucas-clemente/quic-go" "github.com/ooni/probe-cli/v3/internal/bytecounter" + "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/netx/dialer" "github.com/ooni/probe-cli/v3/internal/engine/netx/httptransport" "github.com/ooni/probe-cli/v3/internal/engine/netx/quicdialer" "github.com/ooni/probe-cli/v3/internal/engine/netx/resolver" "github.com/ooni/probe-cli/v3/internal/engine/netx/tlsdialer" "github.com/ooni/probe-cli/v3/internal/engine/netx/trace" - "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite" ) diff --git a/internal/engine/netx/netx_test.go b/internal/engine/netx/netx_test.go index bc07d02..b0db2a9 100644 --- a/internal/engine/netx/netx_test.go +++ b/internal/engine/netx/netx_test.go @@ -11,12 +11,12 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/v3/internal/bytecounter" + "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" "github.com/ooni/probe-cli/v3/internal/engine/netx" "github.com/ooni/probe-cli/v3/internal/engine/netx/httptransport" "github.com/ooni/probe-cli/v3/internal/engine/netx/resolver" "github.com/ooni/probe-cli/v3/internal/engine/netx/tlsdialer" "github.com/ooni/probe-cli/v3/internal/engine/netx/trace" - "github.com/ooni/probe-cli/v3/internal/errorsx" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/netxlite/mocks" )