From 92b657de693fd22210a74d85beed986267378ddd Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Mon, 16 Jan 2023 13:00:24 +0100 Subject: [PATCH] refactor: move all experiments into internal/experiment (#1033) See https://github.com/ooni/probe/issues/2115 and https://github.com/ooni/probe/issues/2273 While there, fix a test that was broken by https://github.com/ooni/probe-cli/commit/c6b275e77d317a70c646e9c48a87c5af9f25a08e. --- internal/cmd/ooporthelper/main.go | 2 +- internal/{engine => }/experiment/README.md | 0 internal/{engine => }/experiment/dash/collect.go | 0 internal/{engine => }/experiment/dash/collect_test.go | 0 internal/{engine => }/experiment/dash/dash.go | 0 internal/{engine => }/experiment/dash/dash_test.go | 0 internal/{engine => }/experiment/dash/doc.go | 0 internal/{engine => }/experiment/dash/download.go | 0 internal/{engine => }/experiment/dash/download_test.go | 0 internal/{engine => }/experiment/dash/fake_test.go | 0 internal/{engine => }/experiment/dash/locate.go | 0 internal/{engine => }/experiment/dash/model.go | 0 internal/{engine => }/experiment/dash/negotiate.go | 0 internal/{engine => }/experiment/dash/negotiate_test.go | 0 internal/{engine => }/experiment/dash/spec.go | 0 internal/{engine => }/experiment/dnscheck/dnscheck.go | 2 +- internal/{engine => }/experiment/dnscheck/dnscheck_test.go | 0 internal/{engine => }/experiment/dnsping/dnsping.go | 0 internal/{engine => }/experiment/dnsping/dnsping_test.go | 0 internal/{engine => }/experiment/dnsping/testkeys.go | 0 internal/{engine => }/experiment/echcheck/config.go | 0 internal/{engine => }/experiment/echcheck/config_test.go | 0 internal/{engine => }/experiment/echcheck/doc.go | 0 internal/{engine => }/experiment/echcheck/generate.go | 0 internal/{engine => }/experiment/echcheck/handshake.go | 0 internal/{engine => }/experiment/echcheck/handshake_test.go | 0 internal/{engine => }/experiment/echcheck/measure.go | 0 internal/{engine => }/experiment/echcheck/measure_test.go | 0 internal/{engine => }/experiment/echcheck/utls.go | 0 internal/{engine => }/experiment/example/example.go | 0 internal/{engine => }/experiment/example/example_test.go | 2 +- internal/{engine => }/experiment/fbmessenger/fbmessenger.go | 2 +- .../{engine => }/experiment/fbmessenger/fbmessenger_test.go | 4 ++-- internal/{engine => }/experiment/hhfm/fake_test.go | 0 internal/{engine => }/experiment/hhfm/hhfm.go | 2 +- internal/{engine => }/experiment/hhfm/hhfm_test.go | 4 ++-- internal/{engine => }/experiment/hirl/fake_test.go | 0 internal/{engine => }/experiment/hirl/hirl.go | 0 internal/{engine => }/experiment/hirl/hirl_test.go | 2 +- .../experiment/httphostheader/httphostheader.go | 2 +- .../experiment/httphostheader/httphostheader_test.go | 0 internal/{engine => }/experiment/ndt7/callback.go | 0 internal/{engine => }/experiment/ndt7/dial.go | 0 internal/{engine => }/experiment/ndt7/dial_test.go | 0 internal/{engine => }/experiment/ndt7/doc.go | 0 internal/{engine => }/experiment/ndt7/download.go | 0 internal/{engine => }/experiment/ndt7/download_test.go | 0 internal/{engine => }/experiment/ndt7/ndt7.go | 0 internal/{engine => }/experiment/ndt7/ndt7_test.go | 0 internal/{engine => }/experiment/ndt7/param.go | 0 internal/{engine => }/experiment/ndt7/spec.go | 0 internal/{engine => }/experiment/ndt7/upload.go | 0 internal/{engine => }/experiment/ndt7/upload_test.go | 0 internal/{engine => }/experiment/ndt7/wsconn.go | 0 internal/{engine => }/experiment/ndt7/wsconn_test.go | 0 internal/{engine => }/experiment/portfiltering/config.go | 0 .../{engine => }/experiment/portfiltering/config_test.go | 0 internal/{engine => }/experiment/portfiltering/doc.go | 0 internal/{engine => }/experiment/portfiltering/measurer.go | 0 .../{engine => }/experiment/portfiltering/measurer_test.go | 0 internal/{engine => }/experiment/portfiltering/ports.go | 0 internal/{engine => }/experiment/portfiltering/summary.go | 0 .../{engine => }/experiment/portfiltering/tcpconnect.go | 0 internal/{engine => }/experiment/portfiltering/testkeys.go | 0 internal/{engine => }/experiment/psiphon/psiphon.go | 2 +- internal/{engine => }/experiment/psiphon/psiphon_test.go | 4 ++-- internal/{engine => }/experiment/quicping/crypto.go | 0 internal/{engine => }/experiment/quicping/quic.go | 0 internal/{engine => }/experiment/quicping/quicping.go | 0 internal/{engine => }/experiment/quicping/quicping_test.go | 0 internal/{engine => }/experiment/riseupvpn/riseupvpn.go | 2 +- .../{engine => }/experiment/riseupvpn/riseupvpn_test.go | 4 ++-- internal/{engine => }/experiment/run/dnscheck.go | 2 +- internal/{engine => }/experiment/run/doc.go | 0 internal/{engine => }/experiment/run/run.go | 4 ++-- internal/{engine => }/experiment/run/run_test.go | 6 +++--- internal/{engine => }/experiment/run/table.go | 2 +- internal/{engine => }/experiment/run/urlgetter.go | 2 +- internal/{engine => }/experiment/signal/signal.go | 2 +- internal/{engine => }/experiment/signal/signal_test.go | 4 ++-- .../experiment/simplequicping/simplequicping.go | 0 .../experiment/simplequicping/simplequicping_test.go | 0 internal/{engine => }/experiment/sniblocking/sniblocking.go | 2 +- .../{engine => }/experiment/sniblocking/sniblocking_test.go | 0 .../{engine => }/experiment/stunreachability/fake_test.go | 0 .../experiment/stunreachability/stunreachability.go | 0 .../experiment/stunreachability/stunreachability_test.go | 0 internal/{engine => }/experiment/tcpping/tcpping.go | 0 internal/{engine => }/experiment/tcpping/tcpping_test.go | 0 internal/{engine => }/experiment/telegram/telegram.go | 2 +- internal/{engine => }/experiment/telegram/telegram_test.go | 4 ++-- internal/{engine => }/experiment/tlsmiddlebox/config.go | 0 .../{engine => }/experiment/tlsmiddlebox/config_test.go | 0 internal/{engine => }/experiment/tlsmiddlebox/conn.go | 0 internal/{engine => }/experiment/tlsmiddlebox/conn_test.go | 0 internal/{engine => }/experiment/tlsmiddlebox/connect.go | 0 internal/{engine => }/experiment/tlsmiddlebox/dialer.go | 0 .../{engine => }/experiment/tlsmiddlebox/dialer_test.go | 0 internal/{engine => }/experiment/tlsmiddlebox/dns.go | 0 internal/{engine => }/experiment/tlsmiddlebox/doc.go | 0 internal/{engine => }/experiment/tlsmiddlebox/measurer.go | 0 .../{engine => }/experiment/tlsmiddlebox/measurer_test.go | 0 internal/{engine => }/experiment/tlsmiddlebox/summary.go | 0 .../{engine => }/experiment/tlsmiddlebox/syscall_cgo.go | 0 .../experiment/tlsmiddlebox/syscall_otherwise.go | 0 .../{engine => }/experiment/tlsmiddlebox/syscall_unix.go | 0 .../{engine => }/experiment/tlsmiddlebox/syscall_windows.go | 0 internal/{engine => }/experiment/tlsmiddlebox/testkeys.go | 0 internal/{engine => }/experiment/tlsmiddlebox/trace.go | 0 internal/{engine => }/experiment/tlsmiddlebox/tracing.go | 0 .../{engine => }/experiment/tlsmiddlebox/tracing_test.go | 0 internal/{engine => }/experiment/tlsmiddlebox/utils.go | 0 internal/{engine => }/experiment/tlsmiddlebox/utils_test.go | 0 internal/{engine => }/experiment/tlsping/tlsping.go | 0 internal/{engine => }/experiment/tlsping/tlsping_test.go | 0 internal/{engine => }/experiment/tlstool/internal/dialer.go | 0 .../{engine => }/experiment/tlstool/internal/dialer_test.go | 2 +- .../{engine => }/experiment/tlstool/internal/fake_test.go | 0 .../{engine => }/experiment/tlstool/internal/internal.go | 0 .../experiment/tlstool/internal/internal_test.go | 2 +- .../{engine => }/experiment/tlstool/internal/splitter.go | 0 .../experiment/tlstool/internal/splitter_test.go | 2 +- internal/{engine => }/experiment/tlstool/internal/writer.go | 0 .../{engine => }/experiment/tlstool/internal/writer_test.go | 2 +- internal/{engine => }/experiment/tlstool/tlstool.go | 2 +- internal/{engine => }/experiment/tlstool/tlstool_test.go | 2 +- internal/{engine => }/experiment/tor/tor.go | 0 internal/{engine => }/experiment/tor/tor_test.go | 0 internal/{engine => }/experiment/torsf/.gitignore | 0 internal/{engine => }/experiment/torsf/integration_test.go | 2 +- internal/{engine => }/experiment/torsf/testdata/partial.log | 0 internal/{engine => }/experiment/torsf/testdata/tor.log | 0 internal/{engine => }/experiment/torsf/torsf.go | 0 internal/{engine => }/experiment/torsf/torsf_test.go | 0 internal/{engine => }/experiment/urlgetter/.gitignore | 0 internal/{engine => }/experiment/urlgetter/configurer.go | 0 .../{engine => }/experiment/urlgetter/configurer_test.go | 2 +- internal/{engine => }/experiment/urlgetter/getter.go | 0 .../experiment/urlgetter/getter_integration_test.go | 2 +- internal/{engine => }/experiment/urlgetter/getter_test.go | 0 internal/{engine => }/experiment/urlgetter/multi.go | 0 internal/{engine => }/experiment/urlgetter/multi_test.go | 2 +- internal/{engine => }/experiment/urlgetter/runner.go | 0 internal/{engine => }/experiment/urlgetter/runner_test.go | 2 +- internal/{engine => }/experiment/urlgetter/urlgetter.go | 0 .../{engine => }/experiment/urlgetter/urlgetter_test.go | 2 +- .../{engine => }/experiment/vanillator/integration_test.go | 2 +- .../{engine => }/experiment/vanillator/testdata/partial.log | 0 .../{engine => }/experiment/vanillator/testdata/tor.log | 0 internal/{engine => }/experiment/vanillator/vanillator.go | 0 .../{engine => }/experiment/vanillator/vanillator_test.go | 0 .../{engine => }/experiment/webconnectivity/connects.go | 2 +- .../experiment/webconnectivity/connects_test.go | 2 +- internal/{engine => }/experiment/webconnectivity/control.go | 0 .../{engine => }/experiment/webconnectivity/control_test.go | 0 .../{engine => }/experiment/webconnectivity/dnsanalysis.go | 0 .../experiment/webconnectivity/dnsanalysis_test.go | 2 +- .../{engine => }/experiment/webconnectivity/dnslookup.go | 2 +- .../experiment/webconnectivity/dnslookup_test.go | 4 ++-- internal/{engine => }/experiment/webconnectivity/doc.go | 0 .../{engine => }/experiment/webconnectivity/endpoints.go | 0 .../experiment/webconnectivity/endpoints_test.go | 2 +- .../{engine => }/experiment/webconnectivity/httpanalysis.go | 4 ++-- .../experiment/webconnectivity/httpanalysis_test.go | 4 ++-- internal/{engine => }/experiment/webconnectivity/httpget.go | 2 +- .../{engine => }/experiment/webconnectivity/httpget_test.go | 2 +- .../experiment/webconnectivity/internal/internal.go | 0 .../experiment/webconnectivity/internal/internal_test.go | 2 +- internal/{engine => }/experiment/webconnectivity/summary.go | 2 +- .../{engine => }/experiment/webconnectivity/summary_test.go | 2 +- .../experiment/webconnectivity/webconnectivity.go | 2 +- .../experiment/webconnectivity/webconnectivity_test.go | 2 +- internal/experiment/webconnectivitylte/analysishttpdiff.go | 2 +- internal/experiment/webconnectivitylte/control.go | 2 +- internal/experiment/webconnectivitylte/measurer.go | 2 +- internal/experiment/webconnectivitylte/testkeys.go | 2 +- internal/{engine => }/experiment/whatsapp/whatsapp.go | 2 +- internal/{engine => }/experiment/whatsapp/whatsapp_test.go | 4 ++-- internal/probeservices/collector_test.go | 2 +- internal/probeservices/testdata/collector-expected.jsonl | 1 + internal/registry/dash.go | 2 +- internal/registry/dnscheck.go | 2 +- internal/registry/dnsping.go | 2 +- internal/registry/echcheck.go | 2 +- internal/registry/example.go | 2 +- internal/registry/fbmessenger.go | 2 +- internal/registry/hhfm.go | 2 +- internal/registry/hirl.go | 2 +- internal/registry/httphostheader.go | 2 +- internal/registry/ndt.go | 2 +- internal/registry/portfiltering.go | 2 +- internal/registry/psiphon.go | 2 +- internal/registry/quicping.go | 2 +- internal/registry/riseupvpn.go | 2 +- internal/registry/run.go | 2 +- internal/registry/signal.go | 2 +- internal/registry/simplequicping.go | 2 +- internal/registry/sniblocking.go | 2 +- internal/registry/stunreachability.go | 2 +- internal/registry/tcpping.go | 2 +- internal/registry/telegram.go | 2 +- internal/registry/tlsmiddlebox.go | 2 +- internal/registry/tlsping.go | 2 +- internal/registry/tlstool.go | 2 +- internal/registry/tor.go | 2 +- internal/registry/torsf.go | 2 +- internal/registry/urlgetter.go | 2 +- internal/registry/vanillator.go | 2 +- internal/registry/webconnectivity.go | 2 +- internal/registry/whatsapp.go | 2 +- internal/tutorial/experiment/torsf/chapter01/main.go | 2 +- 211 files changed, 103 insertions(+), 102 deletions(-) rename internal/{engine => }/experiment/README.md (100%) rename internal/{engine => }/experiment/dash/collect.go (100%) rename internal/{engine => }/experiment/dash/collect_test.go (100%) rename internal/{engine => }/experiment/dash/dash.go (100%) rename internal/{engine => }/experiment/dash/dash_test.go (100%) rename internal/{engine => }/experiment/dash/doc.go (100%) rename internal/{engine => }/experiment/dash/download.go (100%) rename internal/{engine => }/experiment/dash/download_test.go (100%) rename internal/{engine => }/experiment/dash/fake_test.go (100%) rename internal/{engine => }/experiment/dash/locate.go (100%) rename internal/{engine => }/experiment/dash/model.go (100%) rename internal/{engine => }/experiment/dash/negotiate.go (100%) rename internal/{engine => }/experiment/dash/negotiate_test.go (100%) rename internal/{engine => }/experiment/dash/spec.go (100%) rename internal/{engine => }/experiment/dnscheck/dnscheck.go (99%) rename internal/{engine => }/experiment/dnscheck/dnscheck_test.go (100%) rename internal/{engine => }/experiment/dnsping/dnsping.go (100%) rename internal/{engine => }/experiment/dnsping/dnsping_test.go (100%) rename internal/{engine => }/experiment/dnsping/testkeys.go (100%) rename internal/{engine => }/experiment/echcheck/config.go (100%) rename internal/{engine => }/experiment/echcheck/config_test.go (100%) rename internal/{engine => }/experiment/echcheck/doc.go (100%) rename internal/{engine => }/experiment/echcheck/generate.go (100%) rename internal/{engine => }/experiment/echcheck/handshake.go (100%) rename internal/{engine => }/experiment/echcheck/handshake_test.go (100%) rename internal/{engine => }/experiment/echcheck/measure.go (100%) rename internal/{engine => }/experiment/echcheck/measure_test.go (100%) rename internal/{engine => }/experiment/echcheck/utls.go (100%) rename internal/{engine => }/experiment/example/example.go (100%) rename internal/{engine => }/experiment/example/example_test.go (96%) rename internal/{engine => }/experiment/fbmessenger/fbmessenger.go (99%) rename internal/{engine => }/experiment/fbmessenger/fbmessenger_test.go (98%) rename internal/{engine => }/experiment/hhfm/fake_test.go (100%) rename internal/{engine => }/experiment/hhfm/hhfm.go (99%) rename internal/{engine => }/experiment/hhfm/hhfm_test.go (99%) rename internal/{engine => }/experiment/hirl/fake_test.go (100%) rename internal/{engine => }/experiment/hirl/hirl.go (100%) rename internal/{engine => }/experiment/hirl/hirl_test.go (99%) rename internal/{engine => }/experiment/httphostheader/httphostheader.go (97%) rename internal/{engine => }/experiment/httphostheader/httphostheader_test.go (100%) rename internal/{engine => }/experiment/ndt7/callback.go (100%) rename internal/{engine => }/experiment/ndt7/dial.go (100%) rename internal/{engine => }/experiment/ndt7/dial_test.go (100%) rename internal/{engine => }/experiment/ndt7/doc.go (100%) rename internal/{engine => }/experiment/ndt7/download.go (100%) rename internal/{engine => }/experiment/ndt7/download_test.go (100%) rename internal/{engine => }/experiment/ndt7/ndt7.go (100%) rename internal/{engine => }/experiment/ndt7/ndt7_test.go (100%) rename internal/{engine => }/experiment/ndt7/param.go (100%) rename internal/{engine => }/experiment/ndt7/spec.go (100%) rename internal/{engine => }/experiment/ndt7/upload.go (100%) rename internal/{engine => }/experiment/ndt7/upload_test.go (100%) rename internal/{engine => }/experiment/ndt7/wsconn.go (100%) rename internal/{engine => }/experiment/ndt7/wsconn_test.go (100%) rename internal/{engine => }/experiment/portfiltering/config.go (100%) rename internal/{engine => }/experiment/portfiltering/config_test.go (100%) rename internal/{engine => }/experiment/portfiltering/doc.go (100%) rename internal/{engine => }/experiment/portfiltering/measurer.go (100%) rename internal/{engine => }/experiment/portfiltering/measurer_test.go (100%) rename internal/{engine => }/experiment/portfiltering/ports.go (100%) rename internal/{engine => }/experiment/portfiltering/summary.go (100%) rename internal/{engine => }/experiment/portfiltering/tcpconnect.go (100%) rename internal/{engine => }/experiment/portfiltering/testkeys.go (100%) rename internal/{engine => }/experiment/psiphon/psiphon.go (97%) rename internal/{engine => }/experiment/psiphon/psiphon_test.go (97%) rename internal/{engine => }/experiment/quicping/crypto.go (100%) rename internal/{engine => }/experiment/quicping/quic.go (100%) rename internal/{engine => }/experiment/quicping/quicping.go (100%) rename internal/{engine => }/experiment/quicping/quicping_test.go (100%) rename internal/{engine => }/experiment/riseupvpn/riseupvpn.go (99%) rename internal/{engine => }/experiment/riseupvpn/riseupvpn_test.go (99%) rename internal/{engine => }/experiment/run/dnscheck.go (91%) rename internal/{engine => }/experiment/run/doc.go (100%) rename internal/{engine => }/experiment/run/run.go (93%) rename internal/{engine => }/experiment/run/run_test.go (95%) rename internal/{engine => }/experiment/run/table.go (91%) rename internal/{engine => }/experiment/run/urlgetter.go (90%) rename internal/{engine => }/experiment/signal/signal.go (99%) rename internal/{engine => }/experiment/signal/signal_test.go (95%) rename internal/{engine => }/experiment/simplequicping/simplequicping.go (100%) rename internal/{engine => }/experiment/simplequicping/simplequicping_test.go (100%) rename internal/{engine => }/experiment/sniblocking/sniblocking.go (99%) rename internal/{engine => }/experiment/sniblocking/sniblocking_test.go (100%) rename internal/{engine => }/experiment/stunreachability/fake_test.go (100%) rename internal/{engine => }/experiment/stunreachability/stunreachability.go (100%) rename internal/{engine => }/experiment/stunreachability/stunreachability_test.go (100%) rename internal/{engine => }/experiment/tcpping/tcpping.go (100%) rename internal/{engine => }/experiment/tcpping/tcpping_test.go (100%) rename internal/{engine => }/experiment/telegram/telegram.go (98%) rename internal/{engine => }/experiment/telegram/telegram_test.go (98%) rename internal/{engine => }/experiment/tlsmiddlebox/config.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/config_test.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/conn.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/conn_test.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/connect.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/dialer.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/dialer_test.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/dns.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/doc.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/measurer.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/measurer_test.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/summary.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/syscall_cgo.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/syscall_otherwise.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/syscall_unix.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/syscall_windows.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/testkeys.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/trace.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/tracing.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/tracing_test.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/utils.go (100%) rename internal/{engine => }/experiment/tlsmiddlebox/utils_test.go (100%) rename internal/{engine => }/experiment/tlsping/tlsping.go (100%) rename internal/{engine => }/experiment/tlsping/tlsping_test.go (100%) rename internal/{engine => }/experiment/tlstool/internal/dialer.go (100%) rename internal/{engine => }/experiment/tlstool/internal/dialer_test.go (94%) rename internal/{engine => }/experiment/tlstool/internal/fake_test.go (100%) rename internal/{engine => }/experiment/tlstool/internal/internal.go (100%) rename internal/{engine => }/experiment/tlstool/internal/internal_test.go (92%) rename internal/{engine => }/experiment/tlstool/internal/splitter.go (100%) rename internal/{engine => }/experiment/tlstool/internal/splitter_test.go (97%) rename internal/{engine => }/experiment/tlstool/internal/writer.go (100%) rename internal/{engine => }/experiment/tlstool/internal/writer_test.go (97%) rename internal/{engine => }/experiment/tlstool/tlstool.go (98%) rename internal/{engine => }/experiment/tlstool/tlstool_test.go (97%) rename internal/{engine => }/experiment/tor/tor.go (100%) rename internal/{engine => }/experiment/tor/tor_test.go (100%) rename internal/{engine => }/experiment/torsf/.gitignore (100%) rename internal/{engine => }/experiment/torsf/integration_test.go (93%) rename internal/{engine => }/experiment/torsf/testdata/partial.log (100%) rename internal/{engine => }/experiment/torsf/testdata/tor.log (100%) rename internal/{engine => }/experiment/torsf/torsf.go (100%) rename internal/{engine => }/experiment/torsf/torsf_test.go (100%) rename internal/{engine => }/experiment/urlgetter/.gitignore (100%) rename internal/{engine => }/experiment/urlgetter/configurer.go (100%) rename internal/{engine => }/experiment/urlgetter/configurer_test.go (99%) rename internal/{engine => }/experiment/urlgetter/getter.go (100%) rename internal/{engine => }/experiment/urlgetter/getter_integration_test.go (99%) rename internal/{engine => }/experiment/urlgetter/getter_test.go (100%) rename internal/{engine => }/experiment/urlgetter/multi.go (100%) rename internal/{engine => }/experiment/urlgetter/multi_test.go (99%) rename internal/{engine => }/experiment/urlgetter/runner.go (100%) rename internal/{engine => }/experiment/urlgetter/runner_test.go (99%) rename internal/{engine => }/experiment/urlgetter/urlgetter.go (100%) rename internal/{engine => }/experiment/urlgetter/urlgetter_test.go (97%) rename internal/{engine => }/experiment/vanillator/integration_test.go (93%) rename internal/{engine => }/experiment/vanillator/testdata/partial.log (100%) rename internal/{engine => }/experiment/vanillator/testdata/tor.log (100%) rename internal/{engine => }/experiment/vanillator/vanillator.go (100%) rename internal/{engine => }/experiment/vanillator/vanillator_test.go (100%) rename internal/{engine => }/experiment/webconnectivity/connects.go (95%) rename internal/{engine => }/experiment/webconnectivity/connects_test.go (94%) rename internal/{engine => }/experiment/webconnectivity/control.go (100%) rename internal/{engine => }/experiment/webconnectivity/control_test.go (100%) rename internal/{engine => }/experiment/webconnectivity/dnsanalysis.go (100%) rename internal/{engine => }/experiment/webconnectivity/dnsanalysis_test.go (98%) rename internal/{engine => }/experiment/webconnectivity/dnslookup.go (95%) rename internal/{engine => }/experiment/webconnectivity/dnslookup_test.go (91%) rename internal/{engine => }/experiment/webconnectivity/doc.go (100%) rename internal/{engine => }/experiment/webconnectivity/endpoints.go (100%) rename internal/{engine => }/experiment/webconnectivity/endpoints_test.go (98%) rename internal/{engine => }/experiment/webconnectivity/httpanalysis.go (97%) rename internal/{engine => }/experiment/webconnectivity/httpanalysis_test.go (99%) rename internal/{engine => }/experiment/webconnectivity/httpget.go (96%) rename internal/{engine => }/experiment/webconnectivity/httpget_test.go (92%) rename internal/{engine => }/experiment/webconnectivity/internal/internal.go (100%) rename internal/{engine => }/experiment/webconnectivity/internal/internal_test.go (87%) rename internal/{engine => }/experiment/webconnectivity/summary.go (99%) rename internal/{engine => }/experiment/webconnectivity/summary_test.go (99%) rename internal/{engine => }/experiment/webconnectivity/webconnectivity.go (99%) rename internal/{engine => }/experiment/webconnectivity/webconnectivity_test.go (99%) rename internal/{engine => }/experiment/whatsapp/whatsapp.go (99%) rename internal/{engine => }/experiment/whatsapp/whatsapp_test.go (99%) create mode 100644 internal/probeservices/testdata/collector-expected.jsonl diff --git a/internal/cmd/ooporthelper/main.go b/internal/cmd/ooporthelper/main.go index 558487abb2..55b77f0e64 100644 --- a/internal/cmd/ooporthelper/main.go +++ b/internal/cmd/ooporthelper/main.go @@ -9,7 +9,7 @@ import ( "time" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/portfiltering" + "github.com/ooni/probe-cli/v3/internal/experiment/portfiltering" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/engine/experiment/README.md b/internal/experiment/README.md similarity index 100% rename from internal/engine/experiment/README.md rename to internal/experiment/README.md diff --git a/internal/engine/experiment/dash/collect.go b/internal/experiment/dash/collect.go similarity index 100% rename from internal/engine/experiment/dash/collect.go rename to internal/experiment/dash/collect.go diff --git a/internal/engine/experiment/dash/collect_test.go b/internal/experiment/dash/collect_test.go similarity index 100% rename from internal/engine/experiment/dash/collect_test.go rename to internal/experiment/dash/collect_test.go diff --git a/internal/engine/experiment/dash/dash.go b/internal/experiment/dash/dash.go similarity index 100% rename from internal/engine/experiment/dash/dash.go rename to internal/experiment/dash/dash.go diff --git a/internal/engine/experiment/dash/dash_test.go b/internal/experiment/dash/dash_test.go similarity index 100% rename from internal/engine/experiment/dash/dash_test.go rename to internal/experiment/dash/dash_test.go diff --git a/internal/engine/experiment/dash/doc.go b/internal/experiment/dash/doc.go similarity index 100% rename from internal/engine/experiment/dash/doc.go rename to internal/experiment/dash/doc.go diff --git a/internal/engine/experiment/dash/download.go b/internal/experiment/dash/download.go similarity index 100% rename from internal/engine/experiment/dash/download.go rename to internal/experiment/dash/download.go diff --git a/internal/engine/experiment/dash/download_test.go b/internal/experiment/dash/download_test.go similarity index 100% rename from internal/engine/experiment/dash/download_test.go rename to internal/experiment/dash/download_test.go diff --git a/internal/engine/experiment/dash/fake_test.go b/internal/experiment/dash/fake_test.go similarity index 100% rename from internal/engine/experiment/dash/fake_test.go rename to internal/experiment/dash/fake_test.go diff --git a/internal/engine/experiment/dash/locate.go b/internal/experiment/dash/locate.go similarity index 100% rename from internal/engine/experiment/dash/locate.go rename to internal/experiment/dash/locate.go diff --git a/internal/engine/experiment/dash/model.go b/internal/experiment/dash/model.go similarity index 100% rename from internal/engine/experiment/dash/model.go rename to internal/experiment/dash/model.go diff --git a/internal/engine/experiment/dash/negotiate.go b/internal/experiment/dash/negotiate.go similarity index 100% rename from internal/engine/experiment/dash/negotiate.go rename to internal/experiment/dash/negotiate.go diff --git a/internal/engine/experiment/dash/negotiate_test.go b/internal/experiment/dash/negotiate_test.go similarity index 100% rename from internal/engine/experiment/dash/negotiate_test.go rename to internal/experiment/dash/negotiate_test.go diff --git a/internal/engine/experiment/dash/spec.go b/internal/experiment/dash/spec.go similarity index 100% rename from internal/engine/experiment/dash/spec.go rename to internal/experiment/dash/spec.go diff --git a/internal/engine/experiment/dnscheck/dnscheck.go b/internal/experiment/dnscheck/dnscheck.go similarity index 99% rename from internal/engine/experiment/dnscheck/dnscheck.go rename to internal/experiment/dnscheck/dnscheck.go index 4a9541d70d..5979861bd3 100644 --- a/internal/engine/experiment/dnscheck/dnscheck.go +++ b/internal/experiment/dnscheck/dnscheck.go @@ -14,7 +14,7 @@ import ( "sync/atomic" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "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/model" "github.com/ooni/probe-cli/v3/internal/runtimex" diff --git a/internal/engine/experiment/dnscheck/dnscheck_test.go b/internal/experiment/dnscheck/dnscheck_test.go similarity index 100% rename from internal/engine/experiment/dnscheck/dnscheck_test.go rename to internal/experiment/dnscheck/dnscheck_test.go diff --git a/internal/engine/experiment/dnsping/dnsping.go b/internal/experiment/dnsping/dnsping.go similarity index 100% rename from internal/engine/experiment/dnsping/dnsping.go rename to internal/experiment/dnsping/dnsping.go diff --git a/internal/engine/experiment/dnsping/dnsping_test.go b/internal/experiment/dnsping/dnsping_test.go similarity index 100% rename from internal/engine/experiment/dnsping/dnsping_test.go rename to internal/experiment/dnsping/dnsping_test.go diff --git a/internal/engine/experiment/dnsping/testkeys.go b/internal/experiment/dnsping/testkeys.go similarity index 100% rename from internal/engine/experiment/dnsping/testkeys.go rename to internal/experiment/dnsping/testkeys.go diff --git a/internal/engine/experiment/echcheck/config.go b/internal/experiment/echcheck/config.go similarity index 100% rename from internal/engine/experiment/echcheck/config.go rename to internal/experiment/echcheck/config.go diff --git a/internal/engine/experiment/echcheck/config_test.go b/internal/experiment/echcheck/config_test.go similarity index 100% rename from internal/engine/experiment/echcheck/config_test.go rename to internal/experiment/echcheck/config_test.go diff --git a/internal/engine/experiment/echcheck/doc.go b/internal/experiment/echcheck/doc.go similarity index 100% rename from internal/engine/experiment/echcheck/doc.go rename to internal/experiment/echcheck/doc.go diff --git a/internal/engine/experiment/echcheck/generate.go b/internal/experiment/echcheck/generate.go similarity index 100% rename from internal/engine/experiment/echcheck/generate.go rename to internal/experiment/echcheck/generate.go diff --git a/internal/engine/experiment/echcheck/handshake.go b/internal/experiment/echcheck/handshake.go similarity index 100% rename from internal/engine/experiment/echcheck/handshake.go rename to internal/experiment/echcheck/handshake.go diff --git a/internal/engine/experiment/echcheck/handshake_test.go b/internal/experiment/echcheck/handshake_test.go similarity index 100% rename from internal/engine/experiment/echcheck/handshake_test.go rename to internal/experiment/echcheck/handshake_test.go diff --git a/internal/engine/experiment/echcheck/measure.go b/internal/experiment/echcheck/measure.go similarity index 100% rename from internal/engine/experiment/echcheck/measure.go rename to internal/experiment/echcheck/measure.go diff --git a/internal/engine/experiment/echcheck/measure_test.go b/internal/experiment/echcheck/measure_test.go similarity index 100% rename from internal/engine/experiment/echcheck/measure_test.go rename to internal/experiment/echcheck/measure_test.go diff --git a/internal/engine/experiment/echcheck/utls.go b/internal/experiment/echcheck/utls.go similarity index 100% rename from internal/engine/experiment/echcheck/utls.go rename to internal/experiment/echcheck/utls.go diff --git a/internal/engine/experiment/example/example.go b/internal/experiment/example/example.go similarity index 100% rename from internal/engine/experiment/example/example.go rename to internal/experiment/example/example.go diff --git a/internal/engine/experiment/example/example_test.go b/internal/experiment/example/example_test.go similarity index 96% rename from internal/engine/experiment/example/example_test.go rename to internal/experiment/example/example_test.go index 753ee98c7e..6a9918347a 100644 --- a/internal/engine/experiment/example/example_test.go +++ b/internal/experiment/example/example_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/example" + "github.com/ooni/probe-cli/v3/internal/experiment/example" "github.com/ooni/probe-cli/v3/internal/legacy/mockable" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/fbmessenger/fbmessenger.go b/internal/experiment/fbmessenger/fbmessenger.go similarity index 99% rename from internal/engine/experiment/fbmessenger/fbmessenger.go rename to internal/experiment/fbmessenger/fbmessenger.go index 3901845e0e..07a7d5f751 100644 --- a/internal/engine/experiment/fbmessenger/fbmessenger.go +++ b/internal/experiment/fbmessenger/fbmessenger.go @@ -9,7 +9,7 @@ import ( "math/rand" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" ) diff --git a/internal/engine/experiment/fbmessenger/fbmessenger_test.go b/internal/experiment/fbmessenger/fbmessenger_test.go similarity index 98% rename from internal/engine/experiment/fbmessenger/fbmessenger_test.go rename to internal/experiment/fbmessenger/fbmessenger_test.go index 75beee5192..633ac8d7d8 100644 --- a/internal/engine/experiment/fbmessenger/fbmessenger_test.go +++ b/internal/experiment/fbmessenger/fbmessenger_test.go @@ -7,8 +7,8 @@ import ( "github.com/apex/log" engine "github.com/ooni/probe-cli/v3/internal/engine" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/fbmessenger" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "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/mockable" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" diff --git a/internal/engine/experiment/hhfm/fake_test.go b/internal/experiment/hhfm/fake_test.go similarity index 100% rename from internal/engine/experiment/hhfm/fake_test.go rename to internal/experiment/hhfm/fake_test.go diff --git a/internal/engine/experiment/hhfm/hhfm.go b/internal/experiment/hhfm/hhfm.go similarity index 99% rename from internal/engine/experiment/hhfm/hhfm.go rename to internal/experiment/hhfm/hhfm.go index 851843299c..09e43fecd6 100644 --- a/internal/engine/experiment/hhfm/hhfm.go +++ b/internal/experiment/hhfm/hhfm.go @@ -14,7 +14,7 @@ import ( "sort" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/randx" diff --git a/internal/engine/experiment/hhfm/hhfm_test.go b/internal/experiment/hhfm/hhfm_test.go similarity index 99% rename from internal/engine/experiment/hhfm/hhfm_test.go rename to internal/experiment/hhfm/hhfm_test.go index 08fbd4b518..1dd10989dd 100644 --- a/internal/engine/experiment/hhfm/hhfm_test.go +++ b/internal/experiment/hhfm/hhfm_test.go @@ -13,8 +13,8 @@ import ( "github.com/apex/log" "github.com/google/go-cmp/cmp" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/hhfm" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "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/model" "github.com/ooni/probe-cli/v3/internal/netxlite" diff --git a/internal/engine/experiment/hirl/fake_test.go b/internal/experiment/hirl/fake_test.go similarity index 100% rename from internal/engine/experiment/hirl/fake_test.go rename to internal/experiment/hirl/fake_test.go diff --git a/internal/engine/experiment/hirl/hirl.go b/internal/experiment/hirl/hirl.go similarity index 100% rename from internal/engine/experiment/hirl/hirl.go rename to internal/experiment/hirl/hirl.go diff --git a/internal/engine/experiment/hirl/hirl_test.go b/internal/experiment/hirl/hirl_test.go similarity index 99% rename from internal/engine/experiment/hirl/hirl_test.go rename to internal/experiment/hirl/hirl_test.go index 569dbf0227..44f5084847 100644 --- a/internal/engine/experiment/hirl/hirl_test.go +++ b/internal/experiment/hirl/hirl_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/hirl" + "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/model" diff --git a/internal/engine/experiment/httphostheader/httphostheader.go b/internal/experiment/httphostheader/httphostheader.go similarity index 97% rename from internal/engine/experiment/httphostheader/httphostheader.go rename to internal/experiment/httphostheader/httphostheader.go index 0a6a5b4572..7ac1fe2073 100644 --- a/internal/engine/experiment/httphostheader/httphostheader.go +++ b/internal/experiment/httphostheader/httphostheader.go @@ -9,7 +9,7 @@ import ( "errors" "fmt" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/httphostheader/httphostheader_test.go b/internal/experiment/httphostheader/httphostheader_test.go similarity index 100% rename from internal/engine/experiment/httphostheader/httphostheader_test.go rename to internal/experiment/httphostheader/httphostheader_test.go diff --git a/internal/engine/experiment/ndt7/callback.go b/internal/experiment/ndt7/callback.go similarity index 100% rename from internal/engine/experiment/ndt7/callback.go rename to internal/experiment/ndt7/callback.go diff --git a/internal/engine/experiment/ndt7/dial.go b/internal/experiment/ndt7/dial.go similarity index 100% rename from internal/engine/experiment/ndt7/dial.go rename to internal/experiment/ndt7/dial.go diff --git a/internal/engine/experiment/ndt7/dial_test.go b/internal/experiment/ndt7/dial_test.go similarity index 100% rename from internal/engine/experiment/ndt7/dial_test.go rename to internal/experiment/ndt7/dial_test.go diff --git a/internal/engine/experiment/ndt7/doc.go b/internal/experiment/ndt7/doc.go similarity index 100% rename from internal/engine/experiment/ndt7/doc.go rename to internal/experiment/ndt7/doc.go diff --git a/internal/engine/experiment/ndt7/download.go b/internal/experiment/ndt7/download.go similarity index 100% rename from internal/engine/experiment/ndt7/download.go rename to internal/experiment/ndt7/download.go diff --git a/internal/engine/experiment/ndt7/download_test.go b/internal/experiment/ndt7/download_test.go similarity index 100% rename from internal/engine/experiment/ndt7/download_test.go rename to internal/experiment/ndt7/download_test.go diff --git a/internal/engine/experiment/ndt7/ndt7.go b/internal/experiment/ndt7/ndt7.go similarity index 100% rename from internal/engine/experiment/ndt7/ndt7.go rename to internal/experiment/ndt7/ndt7.go diff --git a/internal/engine/experiment/ndt7/ndt7_test.go b/internal/experiment/ndt7/ndt7_test.go similarity index 100% rename from internal/engine/experiment/ndt7/ndt7_test.go rename to internal/experiment/ndt7/ndt7_test.go diff --git a/internal/engine/experiment/ndt7/param.go b/internal/experiment/ndt7/param.go similarity index 100% rename from internal/engine/experiment/ndt7/param.go rename to internal/experiment/ndt7/param.go diff --git a/internal/engine/experiment/ndt7/spec.go b/internal/experiment/ndt7/spec.go similarity index 100% rename from internal/engine/experiment/ndt7/spec.go rename to internal/experiment/ndt7/spec.go diff --git a/internal/engine/experiment/ndt7/upload.go b/internal/experiment/ndt7/upload.go similarity index 100% rename from internal/engine/experiment/ndt7/upload.go rename to internal/experiment/ndt7/upload.go diff --git a/internal/engine/experiment/ndt7/upload_test.go b/internal/experiment/ndt7/upload_test.go similarity index 100% rename from internal/engine/experiment/ndt7/upload_test.go rename to internal/experiment/ndt7/upload_test.go diff --git a/internal/engine/experiment/ndt7/wsconn.go b/internal/experiment/ndt7/wsconn.go similarity index 100% rename from internal/engine/experiment/ndt7/wsconn.go rename to internal/experiment/ndt7/wsconn.go diff --git a/internal/engine/experiment/ndt7/wsconn_test.go b/internal/experiment/ndt7/wsconn_test.go similarity index 100% rename from internal/engine/experiment/ndt7/wsconn_test.go rename to internal/experiment/ndt7/wsconn_test.go diff --git a/internal/engine/experiment/portfiltering/config.go b/internal/experiment/portfiltering/config.go similarity index 100% rename from internal/engine/experiment/portfiltering/config.go rename to internal/experiment/portfiltering/config.go diff --git a/internal/engine/experiment/portfiltering/config_test.go b/internal/experiment/portfiltering/config_test.go similarity index 100% rename from internal/engine/experiment/portfiltering/config_test.go rename to internal/experiment/portfiltering/config_test.go diff --git a/internal/engine/experiment/portfiltering/doc.go b/internal/experiment/portfiltering/doc.go similarity index 100% rename from internal/engine/experiment/portfiltering/doc.go rename to internal/experiment/portfiltering/doc.go diff --git a/internal/engine/experiment/portfiltering/measurer.go b/internal/experiment/portfiltering/measurer.go similarity index 100% rename from internal/engine/experiment/portfiltering/measurer.go rename to internal/experiment/portfiltering/measurer.go diff --git a/internal/engine/experiment/portfiltering/measurer_test.go b/internal/experiment/portfiltering/measurer_test.go similarity index 100% rename from internal/engine/experiment/portfiltering/measurer_test.go rename to internal/experiment/portfiltering/measurer_test.go diff --git a/internal/engine/experiment/portfiltering/ports.go b/internal/experiment/portfiltering/ports.go similarity index 100% rename from internal/engine/experiment/portfiltering/ports.go rename to internal/experiment/portfiltering/ports.go diff --git a/internal/engine/experiment/portfiltering/summary.go b/internal/experiment/portfiltering/summary.go similarity index 100% rename from internal/engine/experiment/portfiltering/summary.go rename to internal/experiment/portfiltering/summary.go diff --git a/internal/engine/experiment/portfiltering/tcpconnect.go b/internal/experiment/portfiltering/tcpconnect.go similarity index 100% rename from internal/engine/experiment/portfiltering/tcpconnect.go rename to internal/experiment/portfiltering/tcpconnect.go diff --git a/internal/engine/experiment/portfiltering/testkeys.go b/internal/experiment/portfiltering/testkeys.go similarity index 100% rename from internal/engine/experiment/portfiltering/testkeys.go rename to internal/experiment/portfiltering/testkeys.go diff --git a/internal/engine/experiment/psiphon/psiphon.go b/internal/experiment/psiphon/psiphon.go similarity index 97% rename from internal/engine/experiment/psiphon/psiphon.go rename to internal/experiment/psiphon/psiphon.go index 45ed762baa..a70150907b 100644 --- a/internal/engine/experiment/psiphon/psiphon.go +++ b/internal/experiment/psiphon/psiphon.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/psiphon/psiphon_test.go b/internal/experiment/psiphon/psiphon_test.go similarity index 97% rename from internal/engine/experiment/psiphon/psiphon_test.go rename to internal/experiment/psiphon/psiphon_test.go index 97d540637c..28f8e0d894 100644 --- a/internal/engine/experiment/psiphon/psiphon_test.go +++ b/internal/experiment/psiphon/psiphon_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/psiphon" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/psiphon" + "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/model" ) diff --git a/internal/engine/experiment/quicping/crypto.go b/internal/experiment/quicping/crypto.go similarity index 100% rename from internal/engine/experiment/quicping/crypto.go rename to internal/experiment/quicping/crypto.go diff --git a/internal/engine/experiment/quicping/quic.go b/internal/experiment/quicping/quic.go similarity index 100% rename from internal/engine/experiment/quicping/quic.go rename to internal/experiment/quicping/quic.go diff --git a/internal/engine/experiment/quicping/quicping.go b/internal/experiment/quicping/quicping.go similarity index 100% rename from internal/engine/experiment/quicping/quicping.go rename to internal/experiment/quicping/quicping.go diff --git a/internal/engine/experiment/quicping/quicping_test.go b/internal/experiment/quicping/quicping_test.go similarity index 100% rename from internal/engine/experiment/quicping/quicping_test.go rename to internal/experiment/quicping/quicping_test.go diff --git a/internal/engine/experiment/riseupvpn/riseupvpn.go b/internal/experiment/riseupvpn/riseupvpn.go similarity index 99% rename from internal/engine/experiment/riseupvpn/riseupvpn.go rename to internal/experiment/riseupvpn/riseupvpn.go index 10aa8de0f7..37061826cd 100644 --- a/internal/engine/experiment/riseupvpn/riseupvpn.go +++ b/internal/experiment/riseupvpn/riseupvpn.go @@ -9,7 +9,7 @@ import ( "errors" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/tracex" diff --git a/internal/engine/experiment/riseupvpn/riseupvpn_test.go b/internal/experiment/riseupvpn/riseupvpn_test.go similarity index 99% rename from internal/engine/experiment/riseupvpn/riseupvpn_test.go rename to internal/experiment/riseupvpn/riseupvpn_test.go index 4cd6b84614..9af91c9699 100644 --- a/internal/engine/experiment/riseupvpn/riseupvpn_test.go +++ b/internal/experiment/riseupvpn/riseupvpn_test.go @@ -12,8 +12,8 @@ import ( "github.com/apex/log" "github.com/google/go-cmp/cmp" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/riseupvpn" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "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/model" "github.com/ooni/probe-cli/v3/internal/netxlite" diff --git a/internal/engine/experiment/run/dnscheck.go b/internal/experiment/run/dnscheck.go similarity index 91% rename from internal/engine/experiment/run/dnscheck.go rename to internal/experiment/run/dnscheck.go index 538e9a0a65..c2084c6acc 100644 --- a/internal/engine/experiment/run/dnscheck.go +++ b/internal/experiment/run/dnscheck.go @@ -3,7 +3,7 @@ package run import ( "context" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/dnscheck" + "github.com/ooni/probe-cli/v3/internal/experiment/dnscheck" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/run/doc.go b/internal/experiment/run/doc.go similarity index 100% rename from internal/engine/experiment/run/doc.go rename to internal/experiment/run/doc.go diff --git a/internal/engine/experiment/run/run.go b/internal/experiment/run/run.go similarity index 93% rename from internal/engine/experiment/run/run.go rename to internal/experiment/run/run.go index a25cf89b69..63c623e00d 100644 --- a/internal/engine/experiment/run/run.go +++ b/internal/experiment/run/run.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/dnscheck" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/dnscheck" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/run/run_test.go b/internal/experiment/run/run_test.go similarity index 95% rename from internal/engine/experiment/run/run_test.go rename to internal/experiment/run/run_test.go index e44b924e96..468e21be31 100644 --- a/internal/engine/experiment/run/run_test.go +++ b/internal/experiment/run/run_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/dnscheck" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/run" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/dnscheck" + "github.com/ooni/probe-cli/v3/internal/experiment/run" + "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/model" ) diff --git a/internal/engine/experiment/run/table.go b/internal/experiment/run/table.go similarity index 91% rename from internal/engine/experiment/run/table.go rename to internal/experiment/run/table.go index b618399524..8ac6dbb3c3 100644 --- a/internal/engine/experiment/run/table.go +++ b/internal/experiment/run/table.go @@ -3,7 +3,7 @@ package run import ( "context" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/dnscheck" + "github.com/ooni/probe-cli/v3/internal/experiment/dnscheck" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/run/urlgetter.go b/internal/experiment/run/urlgetter.go similarity index 90% rename from internal/engine/experiment/run/urlgetter.go rename to internal/experiment/run/urlgetter.go index 753c05194f..74ee845df0 100644 --- a/internal/engine/experiment/run/urlgetter.go +++ b/internal/experiment/run/urlgetter.go @@ -3,7 +3,7 @@ package run import ( "context" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/signal/signal.go b/internal/experiment/signal/signal.go similarity index 99% rename from internal/engine/experiment/signal/signal.go rename to internal/experiment/signal/signal.go index df89fac461..b4fa466c1d 100644 --- a/internal/engine/experiment/signal/signal.go +++ b/internal/experiment/signal/signal.go @@ -8,7 +8,7 @@ import ( "errors" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" ) diff --git a/internal/engine/experiment/signal/signal_test.go b/internal/experiment/signal/signal_test.go similarity index 95% rename from internal/engine/experiment/signal/signal_test.go rename to internal/experiment/signal/signal_test.go index fae2a62e59..9177e0bfb7 100644 --- a/internal/engine/experiment/signal/signal_test.go +++ b/internal/experiment/signal/signal_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/signal" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/signal" + "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/model" "github.com/ooni/probe-cli/v3/internal/netxlite" diff --git a/internal/engine/experiment/simplequicping/simplequicping.go b/internal/experiment/simplequicping/simplequicping.go similarity index 100% rename from internal/engine/experiment/simplequicping/simplequicping.go rename to internal/experiment/simplequicping/simplequicping.go diff --git a/internal/engine/experiment/simplequicping/simplequicping_test.go b/internal/experiment/simplequicping/simplequicping_test.go similarity index 100% rename from internal/engine/experiment/simplequicping/simplequicping_test.go rename to internal/experiment/simplequicping/simplequicping_test.go diff --git a/internal/engine/experiment/sniblocking/sniblocking.go b/internal/experiment/sniblocking/sniblocking.go similarity index 99% rename from internal/engine/experiment/sniblocking/sniblocking.go rename to internal/experiment/sniblocking/sniblocking.go index 9bb3a40a74..11350fad30 100644 --- a/internal/engine/experiment/sniblocking/sniblocking.go +++ b/internal/experiment/sniblocking/sniblocking.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" ) diff --git a/internal/engine/experiment/sniblocking/sniblocking_test.go b/internal/experiment/sniblocking/sniblocking_test.go similarity index 100% rename from internal/engine/experiment/sniblocking/sniblocking_test.go rename to internal/experiment/sniblocking/sniblocking_test.go diff --git a/internal/engine/experiment/stunreachability/fake_test.go b/internal/experiment/stunreachability/fake_test.go similarity index 100% rename from internal/engine/experiment/stunreachability/fake_test.go rename to internal/experiment/stunreachability/fake_test.go diff --git a/internal/engine/experiment/stunreachability/stunreachability.go b/internal/experiment/stunreachability/stunreachability.go similarity index 100% rename from internal/engine/experiment/stunreachability/stunreachability.go rename to internal/experiment/stunreachability/stunreachability.go diff --git a/internal/engine/experiment/stunreachability/stunreachability_test.go b/internal/experiment/stunreachability/stunreachability_test.go similarity index 100% rename from internal/engine/experiment/stunreachability/stunreachability_test.go rename to internal/experiment/stunreachability/stunreachability_test.go diff --git a/internal/engine/experiment/tcpping/tcpping.go b/internal/experiment/tcpping/tcpping.go similarity index 100% rename from internal/engine/experiment/tcpping/tcpping.go rename to internal/experiment/tcpping/tcpping.go diff --git a/internal/engine/experiment/tcpping/tcpping_test.go b/internal/experiment/tcpping/tcpping_test.go similarity index 100% rename from internal/engine/experiment/tcpping/tcpping_test.go rename to internal/experiment/tcpping/tcpping_test.go diff --git a/internal/engine/experiment/telegram/telegram.go b/internal/experiment/telegram/telegram.go similarity index 98% rename from internal/engine/experiment/telegram/telegram.go rename to internal/experiment/telegram/telegram.go index d622a281ea..d4c9e1f611 100644 --- a/internal/engine/experiment/telegram/telegram.go +++ b/internal/experiment/telegram/telegram.go @@ -8,7 +8,7 @@ import ( "errors" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" ) diff --git a/internal/engine/experiment/telegram/telegram_test.go b/internal/experiment/telegram/telegram_test.go similarity index 98% rename from internal/engine/experiment/telegram/telegram_test.go rename to internal/experiment/telegram/telegram_test.go index 7f3a410217..bd4394978c 100644 --- a/internal/engine/experiment/telegram/telegram_test.go +++ b/internal/experiment/telegram/telegram_test.go @@ -6,8 +6,8 @@ import ( "io" "testing" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/telegram" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/telegram" + "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/model" "github.com/ooni/probe-cli/v3/internal/netxlite" diff --git a/internal/engine/experiment/tlsmiddlebox/config.go b/internal/experiment/tlsmiddlebox/config.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/config.go rename to internal/experiment/tlsmiddlebox/config.go diff --git a/internal/engine/experiment/tlsmiddlebox/config_test.go b/internal/experiment/tlsmiddlebox/config_test.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/config_test.go rename to internal/experiment/tlsmiddlebox/config_test.go diff --git a/internal/engine/experiment/tlsmiddlebox/conn.go b/internal/experiment/tlsmiddlebox/conn.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/conn.go rename to internal/experiment/tlsmiddlebox/conn.go diff --git a/internal/engine/experiment/tlsmiddlebox/conn_test.go b/internal/experiment/tlsmiddlebox/conn_test.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/conn_test.go rename to internal/experiment/tlsmiddlebox/conn_test.go diff --git a/internal/engine/experiment/tlsmiddlebox/connect.go b/internal/experiment/tlsmiddlebox/connect.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/connect.go rename to internal/experiment/tlsmiddlebox/connect.go diff --git a/internal/engine/experiment/tlsmiddlebox/dialer.go b/internal/experiment/tlsmiddlebox/dialer.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/dialer.go rename to internal/experiment/tlsmiddlebox/dialer.go diff --git a/internal/engine/experiment/tlsmiddlebox/dialer_test.go b/internal/experiment/tlsmiddlebox/dialer_test.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/dialer_test.go rename to internal/experiment/tlsmiddlebox/dialer_test.go diff --git a/internal/engine/experiment/tlsmiddlebox/dns.go b/internal/experiment/tlsmiddlebox/dns.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/dns.go rename to internal/experiment/tlsmiddlebox/dns.go diff --git a/internal/engine/experiment/tlsmiddlebox/doc.go b/internal/experiment/tlsmiddlebox/doc.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/doc.go rename to internal/experiment/tlsmiddlebox/doc.go diff --git a/internal/engine/experiment/tlsmiddlebox/measurer.go b/internal/experiment/tlsmiddlebox/measurer.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/measurer.go rename to internal/experiment/tlsmiddlebox/measurer.go diff --git a/internal/engine/experiment/tlsmiddlebox/measurer_test.go b/internal/experiment/tlsmiddlebox/measurer_test.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/measurer_test.go rename to internal/experiment/tlsmiddlebox/measurer_test.go diff --git a/internal/engine/experiment/tlsmiddlebox/summary.go b/internal/experiment/tlsmiddlebox/summary.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/summary.go rename to internal/experiment/tlsmiddlebox/summary.go diff --git a/internal/engine/experiment/tlsmiddlebox/syscall_cgo.go b/internal/experiment/tlsmiddlebox/syscall_cgo.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/syscall_cgo.go rename to internal/experiment/tlsmiddlebox/syscall_cgo.go diff --git a/internal/engine/experiment/tlsmiddlebox/syscall_otherwise.go b/internal/experiment/tlsmiddlebox/syscall_otherwise.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/syscall_otherwise.go rename to internal/experiment/tlsmiddlebox/syscall_otherwise.go diff --git a/internal/engine/experiment/tlsmiddlebox/syscall_unix.go b/internal/experiment/tlsmiddlebox/syscall_unix.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/syscall_unix.go rename to internal/experiment/tlsmiddlebox/syscall_unix.go diff --git a/internal/engine/experiment/tlsmiddlebox/syscall_windows.go b/internal/experiment/tlsmiddlebox/syscall_windows.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/syscall_windows.go rename to internal/experiment/tlsmiddlebox/syscall_windows.go diff --git a/internal/engine/experiment/tlsmiddlebox/testkeys.go b/internal/experiment/tlsmiddlebox/testkeys.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/testkeys.go rename to internal/experiment/tlsmiddlebox/testkeys.go diff --git a/internal/engine/experiment/tlsmiddlebox/trace.go b/internal/experiment/tlsmiddlebox/trace.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/trace.go rename to internal/experiment/tlsmiddlebox/trace.go diff --git a/internal/engine/experiment/tlsmiddlebox/tracing.go b/internal/experiment/tlsmiddlebox/tracing.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/tracing.go rename to internal/experiment/tlsmiddlebox/tracing.go diff --git a/internal/engine/experiment/tlsmiddlebox/tracing_test.go b/internal/experiment/tlsmiddlebox/tracing_test.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/tracing_test.go rename to internal/experiment/tlsmiddlebox/tracing_test.go diff --git a/internal/engine/experiment/tlsmiddlebox/utils.go b/internal/experiment/tlsmiddlebox/utils.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/utils.go rename to internal/experiment/tlsmiddlebox/utils.go diff --git a/internal/engine/experiment/tlsmiddlebox/utils_test.go b/internal/experiment/tlsmiddlebox/utils_test.go similarity index 100% rename from internal/engine/experiment/tlsmiddlebox/utils_test.go rename to internal/experiment/tlsmiddlebox/utils_test.go diff --git a/internal/engine/experiment/tlsping/tlsping.go b/internal/experiment/tlsping/tlsping.go similarity index 100% rename from internal/engine/experiment/tlsping/tlsping.go rename to internal/experiment/tlsping/tlsping.go diff --git a/internal/engine/experiment/tlsping/tlsping_test.go b/internal/experiment/tlsping/tlsping_test.go similarity index 100% rename from internal/engine/experiment/tlsping/tlsping_test.go rename to internal/experiment/tlsping/tlsping_test.go diff --git a/internal/engine/experiment/tlstool/internal/dialer.go b/internal/experiment/tlstool/internal/dialer.go similarity index 100% rename from internal/engine/experiment/tlstool/internal/dialer.go rename to internal/experiment/tlstool/internal/dialer.go diff --git a/internal/engine/experiment/tlstool/internal/dialer_test.go b/internal/experiment/tlstool/internal/dialer_test.go similarity index 94% rename from internal/engine/experiment/tlstool/internal/dialer_test.go rename to internal/experiment/tlstool/internal/dialer_test.go index e4317b405b..110e6414b2 100644 --- a/internal/engine/experiment/tlstool/internal/dialer_test.go +++ b/internal/experiment/tlstool/internal/dialer_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool/internal" + "github.com/ooni/probe-cli/v3/internal/experiment/tlstool/internal" ) func TestDialerFailure(t *testing.T) { diff --git a/internal/engine/experiment/tlstool/internal/fake_test.go b/internal/experiment/tlstool/internal/fake_test.go similarity index 100% rename from internal/engine/experiment/tlstool/internal/fake_test.go rename to internal/experiment/tlstool/internal/fake_test.go diff --git a/internal/engine/experiment/tlstool/internal/internal.go b/internal/experiment/tlstool/internal/internal.go similarity index 100% rename from internal/engine/experiment/tlstool/internal/internal.go rename to internal/experiment/tlstool/internal/internal.go diff --git a/internal/engine/experiment/tlstool/internal/internal_test.go b/internal/experiment/tlstool/internal/internal_test.go similarity index 92% rename from internal/engine/experiment/tlstool/internal/internal_test.go rename to internal/experiment/tlstool/internal/internal_test.go index 930609bd28..30c694a220 100644 --- a/internal/engine/experiment/tlstool/internal/internal_test.go +++ b/internal/experiment/tlstool/internal/internal_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool/internal" + "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/model" ) diff --git a/internal/engine/experiment/tlstool/internal/splitter.go b/internal/experiment/tlstool/internal/splitter.go similarity index 100% rename from internal/engine/experiment/tlstool/internal/splitter.go rename to internal/experiment/tlstool/internal/splitter.go diff --git a/internal/engine/experiment/tlstool/internal/splitter_test.go b/internal/experiment/tlstool/internal/splitter_test.go similarity index 97% rename from internal/engine/experiment/tlstool/internal/splitter_test.go rename to internal/experiment/tlstool/internal/splitter_test.go index aa318a98e9..dc2e95606a 100644 --- a/internal/engine/experiment/tlstool/internal/splitter_test.go +++ b/internal/experiment/tlstool/internal/splitter_test.go @@ -3,7 +3,7 @@ package internal_test import ( "testing" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool/internal" + "github.com/ooni/probe-cli/v3/internal/experiment/tlstool/internal" "github.com/ooni/probe-cli/v3/internal/randx" ) diff --git a/internal/engine/experiment/tlstool/internal/writer.go b/internal/experiment/tlstool/internal/writer.go similarity index 100% rename from internal/engine/experiment/tlstool/internal/writer.go rename to internal/experiment/tlstool/internal/writer.go diff --git a/internal/engine/experiment/tlstool/internal/writer_test.go b/internal/experiment/tlstool/internal/writer_test.go similarity index 97% rename from internal/engine/experiment/tlstool/internal/writer_test.go rename to internal/experiment/tlstool/internal/writer_test.go index 4fc7f84a8e..e198d84cc3 100644 --- a/internal/engine/experiment/tlstool/internal/writer_test.go +++ b/internal/experiment/tlstool/internal/writer_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool/internal" + "github.com/ooni/probe-cli/v3/internal/experiment/tlstool/internal" ) func TestSleeperWriterWorksAsIntended(t *testing.T) { diff --git a/internal/engine/experiment/tlstool/tlstool.go b/internal/experiment/tlstool/tlstool.go similarity index 98% rename from internal/engine/experiment/tlstool/tlstool.go rename to internal/experiment/tlstool/tlstool.go index f2fc6ea325..248e277804 100644 --- a/internal/engine/experiment/tlstool/tlstool.go +++ b/internal/experiment/tlstool/tlstool.go @@ -15,7 +15,7 @@ import ( "net" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool/internal" + "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/model" "github.com/ooni/probe-cli/v3/internal/runtimex" diff --git a/internal/engine/experiment/tlstool/tlstool_test.go b/internal/experiment/tlstool/tlstool_test.go similarity index 97% rename from internal/engine/experiment/tlstool/tlstool_test.go rename to internal/experiment/tlstool/tlstool_test.go index 28868098a8..c2d96b9a62 100644 --- a/internal/engine/experiment/tlstool/tlstool_test.go +++ b/internal/experiment/tlstool/tlstool_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool" + "github.com/ooni/probe-cli/v3/internal/experiment/tlstool" "github.com/ooni/probe-cli/v3/internal/legacy/mockable" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/tor/tor.go b/internal/experiment/tor/tor.go similarity index 100% rename from internal/engine/experiment/tor/tor.go rename to internal/experiment/tor/tor.go diff --git a/internal/engine/experiment/tor/tor_test.go b/internal/experiment/tor/tor_test.go similarity index 100% rename from internal/engine/experiment/tor/tor_test.go rename to internal/experiment/tor/tor_test.go diff --git a/internal/engine/experiment/torsf/.gitignore b/internal/experiment/torsf/.gitignore similarity index 100% rename from internal/engine/experiment/torsf/.gitignore rename to internal/experiment/torsf/.gitignore diff --git a/internal/engine/experiment/torsf/integration_test.go b/internal/experiment/torsf/integration_test.go similarity index 93% rename from internal/engine/experiment/torsf/integration_test.go rename to internal/experiment/torsf/integration_test.go index 2e6470699d..c52735a2b5 100644 --- a/internal/engine/experiment/torsf/integration_test.go +++ b/internal/experiment/torsf/integration_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/torsf" + "github.com/ooni/probe-cli/v3/internal/experiment/torsf" "github.com/ooni/probe-cli/v3/internal/legacy/mockable" "github.com/ooni/probe-cli/v3/internal/model" "golang.org/x/sys/execabs" diff --git a/internal/engine/experiment/torsf/testdata/partial.log b/internal/experiment/torsf/testdata/partial.log similarity index 100% rename from internal/engine/experiment/torsf/testdata/partial.log rename to internal/experiment/torsf/testdata/partial.log diff --git a/internal/engine/experiment/torsf/testdata/tor.log b/internal/experiment/torsf/testdata/tor.log similarity index 100% rename from internal/engine/experiment/torsf/testdata/tor.log rename to internal/experiment/torsf/testdata/tor.log diff --git a/internal/engine/experiment/torsf/torsf.go b/internal/experiment/torsf/torsf.go similarity index 100% rename from internal/engine/experiment/torsf/torsf.go rename to internal/experiment/torsf/torsf.go diff --git a/internal/engine/experiment/torsf/torsf_test.go b/internal/experiment/torsf/torsf_test.go similarity index 100% rename from internal/engine/experiment/torsf/torsf_test.go rename to internal/experiment/torsf/torsf_test.go diff --git a/internal/engine/experiment/urlgetter/.gitignore b/internal/experiment/urlgetter/.gitignore similarity index 100% rename from internal/engine/experiment/urlgetter/.gitignore rename to internal/experiment/urlgetter/.gitignore diff --git a/internal/engine/experiment/urlgetter/configurer.go b/internal/experiment/urlgetter/configurer.go similarity index 100% rename from internal/engine/experiment/urlgetter/configurer.go rename to internal/experiment/urlgetter/configurer.go diff --git a/internal/engine/experiment/urlgetter/configurer_test.go b/internal/experiment/urlgetter/configurer_test.go similarity index 99% rename from internal/engine/experiment/urlgetter/configurer_test.go rename to internal/experiment/urlgetter/configurer_test.go index 0f13294c5b..8112b92441 100644 --- a/internal/engine/experiment/urlgetter/configurer_test.go +++ b/internal/experiment/urlgetter/configurer_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/tracex" ) diff --git a/internal/engine/experiment/urlgetter/getter.go b/internal/experiment/urlgetter/getter.go similarity index 100% rename from internal/engine/experiment/urlgetter/getter.go rename to internal/experiment/urlgetter/getter.go diff --git a/internal/engine/experiment/urlgetter/getter_integration_test.go b/internal/experiment/urlgetter/getter_integration_test.go similarity index 99% rename from internal/engine/experiment/urlgetter/getter_integration_test.go rename to internal/experiment/urlgetter/getter_integration_test.go index 466ac0c8b5..50eb0f7331 100644 --- a/internal/engine/experiment/urlgetter/getter_integration_test.go +++ b/internal/experiment/urlgetter/getter_integration_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "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/netxlite" ) diff --git a/internal/engine/experiment/urlgetter/getter_test.go b/internal/experiment/urlgetter/getter_test.go similarity index 100% rename from internal/engine/experiment/urlgetter/getter_test.go rename to internal/experiment/urlgetter/getter_test.go diff --git a/internal/engine/experiment/urlgetter/multi.go b/internal/experiment/urlgetter/multi.go similarity index 100% rename from internal/engine/experiment/urlgetter/multi.go rename to internal/experiment/urlgetter/multi.go diff --git a/internal/engine/experiment/urlgetter/multi_test.go b/internal/experiment/urlgetter/multi_test.go similarity index 99% rename from internal/engine/experiment/urlgetter/multi_test.go rename to internal/experiment/urlgetter/multi_test.go index 6569814469..589ba36e22 100644 --- a/internal/engine/experiment/urlgetter/multi_test.go +++ b/internal/experiment/urlgetter/multi_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "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/model" ) diff --git a/internal/engine/experiment/urlgetter/runner.go b/internal/experiment/urlgetter/runner.go similarity index 100% rename from internal/engine/experiment/urlgetter/runner.go rename to internal/experiment/urlgetter/runner.go diff --git a/internal/engine/experiment/urlgetter/runner_test.go b/internal/experiment/urlgetter/runner_test.go similarity index 99% rename from internal/engine/experiment/urlgetter/runner_test.go rename to internal/experiment/urlgetter/runner_test.go index 1ae94185a8..87e53b8920 100644 --- a/internal/engine/experiment/urlgetter/runner_test.go +++ b/internal/experiment/urlgetter/runner_test.go @@ -9,7 +9,7 @@ import ( "sync/atomic" "testing" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/urlgetter/urlgetter.go b/internal/experiment/urlgetter/urlgetter.go similarity index 100% rename from internal/engine/experiment/urlgetter/urlgetter.go rename to internal/experiment/urlgetter/urlgetter.go diff --git a/internal/engine/experiment/urlgetter/urlgetter_test.go b/internal/experiment/urlgetter/urlgetter_test.go similarity index 97% rename from internal/engine/experiment/urlgetter/urlgetter_test.go rename to internal/experiment/urlgetter/urlgetter_test.go index 9e4427bcab..1fbd44dde6 100644 --- a/internal/engine/experiment/urlgetter/urlgetter_test.go +++ b/internal/experiment/urlgetter/urlgetter_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "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/model" ) diff --git a/internal/engine/experiment/vanillator/integration_test.go b/internal/experiment/vanillator/integration_test.go similarity index 93% rename from internal/engine/experiment/vanillator/integration_test.go rename to internal/experiment/vanillator/integration_test.go index 62c53dd1f4..fb66fbd5ba 100644 --- a/internal/engine/experiment/vanillator/integration_test.go +++ b/internal/experiment/vanillator/integration_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/vanillator" + "github.com/ooni/probe-cli/v3/internal/experiment/vanillator" "github.com/ooni/probe-cli/v3/internal/legacy/mockable" "github.com/ooni/probe-cli/v3/internal/model" "golang.org/x/sys/execabs" diff --git a/internal/engine/experiment/vanillator/testdata/partial.log b/internal/experiment/vanillator/testdata/partial.log similarity index 100% rename from internal/engine/experiment/vanillator/testdata/partial.log rename to internal/experiment/vanillator/testdata/partial.log diff --git a/internal/engine/experiment/vanillator/testdata/tor.log b/internal/experiment/vanillator/testdata/tor.log similarity index 100% rename from internal/engine/experiment/vanillator/testdata/tor.log rename to internal/experiment/vanillator/testdata/tor.log diff --git a/internal/engine/experiment/vanillator/vanillator.go b/internal/experiment/vanillator/vanillator.go similarity index 100% rename from internal/engine/experiment/vanillator/vanillator.go rename to internal/experiment/vanillator/vanillator.go diff --git a/internal/engine/experiment/vanillator/vanillator_test.go b/internal/experiment/vanillator/vanillator_test.go similarity index 100% rename from internal/engine/experiment/vanillator/vanillator_test.go rename to internal/experiment/vanillator/vanillator_test.go diff --git a/internal/engine/experiment/webconnectivity/connects.go b/internal/experiment/webconnectivity/connects.go similarity index 95% rename from internal/engine/experiment/webconnectivity/connects.go rename to internal/experiment/webconnectivity/connects.go index fd3cf397be..6c81691f30 100644 --- a/internal/engine/experiment/webconnectivity/connects.go +++ b/internal/experiment/webconnectivity/connects.go @@ -5,7 +5,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/webconnectivity/connects_test.go b/internal/experiment/webconnectivity/connects_test.go similarity index 94% rename from internal/engine/experiment/webconnectivity/connects_test.go rename to internal/experiment/webconnectivity/connects_test.go index 62060da9c3..45ee0f1be5 100644 --- a/internal/engine/experiment/webconnectivity/connects_test.go +++ b/internal/experiment/webconnectivity/connects_test.go @@ -5,7 +5,7 @@ import ( "net/url" "testing" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" ) func TestConnectsSuccess(t *testing.T) { diff --git a/internal/engine/experiment/webconnectivity/control.go b/internal/experiment/webconnectivity/control.go similarity index 100% rename from internal/engine/experiment/webconnectivity/control.go rename to internal/experiment/webconnectivity/control.go diff --git a/internal/engine/experiment/webconnectivity/control_test.go b/internal/experiment/webconnectivity/control_test.go similarity index 100% rename from internal/engine/experiment/webconnectivity/control_test.go rename to internal/experiment/webconnectivity/control_test.go diff --git a/internal/engine/experiment/webconnectivity/dnsanalysis.go b/internal/experiment/webconnectivity/dnsanalysis.go similarity index 100% rename from internal/engine/experiment/webconnectivity/dnsanalysis.go rename to internal/experiment/webconnectivity/dnsanalysis.go diff --git a/internal/engine/experiment/webconnectivity/dnsanalysis_test.go b/internal/experiment/webconnectivity/dnsanalysis_test.go similarity index 98% rename from internal/engine/experiment/webconnectivity/dnsanalysis_test.go rename to internal/experiment/webconnectivity/dnsanalysis_test.go index 0fe2d74267..c72749cbe7 100644 --- a/internal/engine/experiment/webconnectivity/dnsanalysis_test.go +++ b/internal/experiment/webconnectivity/dnsanalysis_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/netxlite" ) diff --git a/internal/engine/experiment/webconnectivity/dnslookup.go b/internal/experiment/webconnectivity/dnslookup.go similarity index 95% rename from internal/engine/experiment/webconnectivity/dnslookup.go rename to internal/experiment/webconnectivity/dnslookup.go index 06284c4fb3..dfd6899195 100644 --- a/internal/engine/experiment/webconnectivity/dnslookup.go +++ b/internal/experiment/webconnectivity/dnslookup.go @@ -7,7 +7,7 @@ import ( "sort" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/webconnectivity/dnslookup_test.go b/internal/experiment/webconnectivity/dnslookup_test.go similarity index 91% rename from internal/engine/experiment/webconnectivity/dnslookup_test.go rename to internal/experiment/webconnectivity/dnslookup_test.go index 0b75708d0e..0cca840e67 100644 --- a/internal/engine/experiment/webconnectivity/dnslookup_test.go +++ b/internal/experiment/webconnectivity/dnslookup_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" ) func TestDNSLookup(t *testing.T) { diff --git a/internal/engine/experiment/webconnectivity/doc.go b/internal/experiment/webconnectivity/doc.go similarity index 100% rename from internal/engine/experiment/webconnectivity/doc.go rename to internal/experiment/webconnectivity/doc.go diff --git a/internal/engine/experiment/webconnectivity/endpoints.go b/internal/experiment/webconnectivity/endpoints.go similarity index 100% rename from internal/engine/experiment/webconnectivity/endpoints.go rename to internal/experiment/webconnectivity/endpoints.go diff --git a/internal/engine/experiment/webconnectivity/endpoints_test.go b/internal/experiment/webconnectivity/endpoints_test.go similarity index 98% rename from internal/engine/experiment/webconnectivity/endpoints_test.go rename to internal/experiment/webconnectivity/endpoints_test.go index f3e389b700..60da668c0b 100644 --- a/internal/engine/experiment/webconnectivity/endpoints_test.go +++ b/internal/experiment/webconnectivity/endpoints_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" ) func TestNewEndpointPortPanicsWithInvalidScheme(t *testing.T) { diff --git a/internal/engine/experiment/webconnectivity/httpanalysis.go b/internal/experiment/webconnectivity/httpanalysis.go similarity index 97% rename from internal/engine/experiment/webconnectivity/httpanalysis.go rename to internal/experiment/webconnectivity/httpanalysis.go index 5ed2ec9da3..6fa3ccb81e 100644 --- a/internal/engine/experiment/webconnectivity/httpanalysis.go +++ b/internal/experiment/webconnectivity/httpanalysis.go @@ -4,8 +4,8 @@ import ( "reflect" "strings" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity/internal" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity/internal" "github.com/ooni/probe-cli/v3/internal/measurexlite" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/webconnectivity/httpanalysis_test.go b/internal/experiment/webconnectivity/httpanalysis_test.go similarity index 99% rename from internal/engine/experiment/webconnectivity/httpanalysis_test.go rename to internal/experiment/webconnectivity/httpanalysis_test.go index 482f7f86a4..14178353b2 100644 --- a/internal/engine/experiment/webconnectivity/httpanalysis_test.go +++ b/internal/experiment/webconnectivity/httpanalysis_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "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/tracex" ) diff --git a/internal/engine/experiment/webconnectivity/httpget.go b/internal/experiment/webconnectivity/httpget.go similarity index 96% rename from internal/engine/experiment/webconnectivity/httpget.go rename to internal/experiment/webconnectivity/httpget.go index 43849e69b6..f59a1702e3 100644 --- a/internal/engine/experiment/webconnectivity/httpget.go +++ b/internal/experiment/webconnectivity/httpget.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/engine/experiment/webconnectivity/httpget_test.go b/internal/experiment/webconnectivity/httpget_test.go similarity index 92% rename from internal/engine/experiment/webconnectivity/httpget_test.go rename to internal/experiment/webconnectivity/httpget_test.go index 6f1ddc9259..7e9e26ef6d 100644 --- a/internal/engine/experiment/webconnectivity/httpget_test.go +++ b/internal/experiment/webconnectivity/httpget_test.go @@ -5,7 +5,7 @@ import ( "net/url" "testing" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" ) func TestHTTPGet(t *testing.T) { diff --git a/internal/engine/experiment/webconnectivity/internal/internal.go b/internal/experiment/webconnectivity/internal/internal.go similarity index 100% rename from internal/engine/experiment/webconnectivity/internal/internal.go rename to internal/experiment/webconnectivity/internal/internal.go diff --git a/internal/engine/experiment/webconnectivity/internal/internal_test.go b/internal/experiment/webconnectivity/internal/internal_test.go similarity index 87% rename from internal/engine/experiment/webconnectivity/internal/internal_test.go rename to internal/experiment/webconnectivity/internal/internal_test.go index f59f74fab6..923e552ea4 100644 --- a/internal/engine/experiment/webconnectivity/internal/internal_test.go +++ b/internal/experiment/webconnectivity/internal/internal_test.go @@ -3,7 +3,7 @@ package internal_test import ( "testing" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity/internal" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity/internal" ) func TestStringPointerToString(t *testing.T) { diff --git a/internal/engine/experiment/webconnectivity/summary.go b/internal/experiment/webconnectivity/summary.go similarity index 99% rename from internal/engine/experiment/webconnectivity/summary.go rename to internal/experiment/webconnectivity/summary.go index 28e84479a4..4601a360eb 100644 --- a/internal/engine/experiment/webconnectivity/summary.go +++ b/internal/experiment/webconnectivity/summary.go @@ -3,7 +3,7 @@ package webconnectivity import ( "strings" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity/internal" + "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/netxlite" ) diff --git a/internal/engine/experiment/webconnectivity/summary_test.go b/internal/experiment/webconnectivity/summary_test.go similarity index 99% rename from internal/engine/experiment/webconnectivity/summary_test.go rename to internal/experiment/webconnectivity/summary_test.go index bcde99e78d..832b61f5ef 100644 --- a/internal/engine/experiment/webconnectivity/summary_test.go +++ b/internal/experiment/webconnectivity/summary_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/tracex" ) diff --git a/internal/engine/experiment/webconnectivity/webconnectivity.go b/internal/experiment/webconnectivity/webconnectivity.go similarity index 99% rename from internal/engine/experiment/webconnectivity/webconnectivity.go rename to internal/experiment/webconnectivity/webconnectivity.go index 6792311c4d..40732abcb9 100644 --- a/internal/engine/experiment/webconnectivity/webconnectivity.go +++ b/internal/experiment/webconnectivity/webconnectivity.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity/internal" + "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/tracex" ) diff --git a/internal/engine/experiment/webconnectivity/webconnectivity_test.go b/internal/experiment/webconnectivity/webconnectivity_test.go similarity index 99% rename from internal/engine/experiment/webconnectivity/webconnectivity_test.go rename to internal/experiment/webconnectivity/webconnectivity_test.go index 6b53693ce7..c76ed801cb 100644 --- a/internal/engine/experiment/webconnectivity/webconnectivity_test.go +++ b/internal/experiment/webconnectivity/webconnectivity_test.go @@ -10,7 +10,7 @@ import ( "github.com/apex/log" "github.com/google/go-cmp/cmp" engine "github.com/ooni/probe-cli/v3/internal/engine" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/tracex" diff --git a/internal/experiment/webconnectivitylte/analysishttpdiff.go b/internal/experiment/webconnectivitylte/analysishttpdiff.go index cf0562b302..d07fd3c42d 100644 --- a/internal/experiment/webconnectivitylte/analysishttpdiff.go +++ b/internal/experiment/webconnectivitylte/analysishttpdiff.go @@ -9,7 +9,7 @@ import ( "reflect" "strings" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/measurexlite" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" diff --git a/internal/experiment/webconnectivitylte/control.go b/internal/experiment/webconnectivitylte/control.go index 42c764d3f7..d691532376 100644 --- a/internal/experiment/webconnectivitylte/control.go +++ b/internal/experiment/webconnectivitylte/control.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/httpapi" "github.com/ooni/probe-cli/v3/internal/measurexlite" "github.com/ooni/probe-cli/v3/internal/model" diff --git a/internal/experiment/webconnectivitylte/measurer.go b/internal/experiment/webconnectivitylte/measurer.go index f1a8073a1d..da0a8ba5d2 100644 --- a/internal/experiment/webconnectivitylte/measurer.go +++ b/internal/experiment/webconnectivitylte/measurer.go @@ -11,7 +11,7 @@ import ( "sync" "sync/atomic" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/model" "golang.org/x/net/publicsuffix" ) diff --git a/internal/experiment/webconnectivitylte/testkeys.go b/internal/experiment/webconnectivitylte/testkeys.go index 5e7d0ea9b7..454f08bc40 100644 --- a/internal/experiment/webconnectivitylte/testkeys.go +++ b/internal/experiment/webconnectivitylte/testkeys.go @@ -11,7 +11,7 @@ import ( "sort" "sync" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/tracex" ) diff --git a/internal/engine/experiment/whatsapp/whatsapp.go b/internal/experiment/whatsapp/whatsapp.go similarity index 99% rename from internal/engine/experiment/whatsapp/whatsapp.go rename to internal/experiment/whatsapp/whatsapp.go index a0a37a8ce8..94055b07dd 100644 --- a/internal/engine/experiment/whatsapp/whatsapp.go +++ b/internal/experiment/whatsapp/whatsapp.go @@ -12,7 +12,7 @@ import ( "regexp" "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/engine/experiment/whatsapp/whatsapp_test.go b/internal/experiment/whatsapp/whatsapp_test.go similarity index 99% rename from internal/engine/experiment/whatsapp/whatsapp_test.go rename to internal/experiment/whatsapp/whatsapp_test.go index bcba4c1082..1322d0ca4f 100644 --- a/internal/engine/experiment/whatsapp/whatsapp_test.go +++ b/internal/experiment/whatsapp/whatsapp_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/whatsapp" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/whatsapp" "github.com/ooni/probe-cli/v3/internal/legacy/mockable" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/probeservices/collector_test.go b/internal/probeservices/collector_test.go index ece3604478..c4bd1359fe 100644 --- a/internal/probeservices/collector_test.go +++ b/internal/probeservices/collector_test.go @@ -237,7 +237,7 @@ func TestEndToEnd(t *testing.T) { if err != nil { panic(err) } - sdata, err := os.ReadFile("../testdata/collector-expected.jsonl") + sdata, err := os.ReadFile("testdata/collector-expected.jsonl") if err != nil { panic(err) } diff --git a/internal/probeservices/testdata/collector-expected.jsonl b/internal/probeservices/testdata/collector-expected.jsonl new file mode 100644 index 0000000000..7f9af5f386 --- /dev/null +++ b/internal/probeservices/testdata/collector-expected.jsonl @@ -0,0 +1 @@ +{"format":"json","content":{"data_format_version":"0.2.0","id":"bdd20d7a-bba5-40dd-a111-9863d7908572","input":null,"measurement_start_time":"2018-11-01 15:33:20","probe_asn":"AS0","probe_cc":"ZZ","probe_ip":"1.2.3.4","probe_network_name":"","report_id":"_id","resolver_asn":"AS15169","resolver_ip":"8.8.8.8","resolver_network_name":"Google LLC","software_name":"ooniprobe-engine","software_version":"0.1.0","test_keys":{"failure":null},"test_name":"dummy","test_runtime":5.0565230846405,"test_start_time":"2018-11-01 15:33:17","test_version":"0.1.0"}} \ No newline at end of file diff --git a/internal/registry/dash.go b/internal/registry/dash.go index 92f0338761..8551f6a20a 100644 --- a/internal/registry/dash.go +++ b/internal/registry/dash.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/dash" + "github.com/ooni/probe-cli/v3/internal/experiment/dash" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/dnscheck.go b/internal/registry/dnscheck.go index acd0a376d4..f949886938 100644 --- a/internal/registry/dnscheck.go +++ b/internal/registry/dnscheck.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/dnscheck" + "github.com/ooni/probe-cli/v3/internal/experiment/dnscheck" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/dnsping.go b/internal/registry/dnsping.go index c4e4fc274b..362c9b7f01 100644 --- a/internal/registry/dnsping.go +++ b/internal/registry/dnsping.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/dnsping" + "github.com/ooni/probe-cli/v3/internal/experiment/dnsping" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/echcheck.go b/internal/registry/echcheck.go index ec6fe188aa..d9826d3671 100644 --- a/internal/registry/echcheck.go +++ b/internal/registry/echcheck.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/echcheck" + "github.com/ooni/probe-cli/v3/internal/experiment/echcheck" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/example.go b/internal/registry/example.go index b0c40b32e5..e8af265d8e 100644 --- a/internal/registry/example.go +++ b/internal/registry/example.go @@ -7,7 +7,7 @@ package registry import ( "time" - "github.com/ooni/probe-cli/v3/internal/engine/experiment/example" + "github.com/ooni/probe-cli/v3/internal/experiment/example" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/fbmessenger.go b/internal/registry/fbmessenger.go index 2bde0f4546..73bee4fe3c 100644 --- a/internal/registry/fbmessenger.go +++ b/internal/registry/fbmessenger.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/fbmessenger" + "github.com/ooni/probe-cli/v3/internal/experiment/fbmessenger" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/hhfm.go b/internal/registry/hhfm.go index 80cde4e806..3b1038ad64 100644 --- a/internal/registry/hhfm.go +++ b/internal/registry/hhfm.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/hhfm" + "github.com/ooni/probe-cli/v3/internal/experiment/hhfm" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/hirl.go b/internal/registry/hirl.go index d266902845..2c55b53b74 100644 --- a/internal/registry/hirl.go +++ b/internal/registry/hirl.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/hirl" + "github.com/ooni/probe-cli/v3/internal/experiment/hirl" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/httphostheader.go b/internal/registry/httphostheader.go index a5de1e811c..7c7ff890fd 100644 --- a/internal/registry/httphostheader.go +++ b/internal/registry/httphostheader.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/httphostheader" + "github.com/ooni/probe-cli/v3/internal/experiment/httphostheader" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/ndt.go b/internal/registry/ndt.go index e48e15c2b8..ded014a4c0 100644 --- a/internal/registry/ndt.go +++ b/internal/registry/ndt.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/ndt7" + "github.com/ooni/probe-cli/v3/internal/experiment/ndt7" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/portfiltering.go b/internal/registry/portfiltering.go index 093ccbabe6..2c175638b4 100644 --- a/internal/registry/portfiltering.go +++ b/internal/registry/portfiltering.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/portfiltering" + "github.com/ooni/probe-cli/v3/internal/experiment/portfiltering" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/psiphon.go b/internal/registry/psiphon.go index 7c2553c6ef..18aae3d784 100644 --- a/internal/registry/psiphon.go +++ b/internal/registry/psiphon.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/psiphon" + "github.com/ooni/probe-cli/v3/internal/experiment/psiphon" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/quicping.go b/internal/registry/quicping.go index 793f52896b..7ada9c3e0b 100644 --- a/internal/registry/quicping.go +++ b/internal/registry/quicping.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/quicping" + "github.com/ooni/probe-cli/v3/internal/experiment/quicping" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/riseupvpn.go b/internal/registry/riseupvpn.go index ec2c7d97b1..cb060ac195 100644 --- a/internal/registry/riseupvpn.go +++ b/internal/registry/riseupvpn.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/riseupvpn" + "github.com/ooni/probe-cli/v3/internal/experiment/riseupvpn" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/run.go b/internal/registry/run.go index 18e0f6866e..2310670c15 100644 --- a/internal/registry/run.go +++ b/internal/registry/run.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/run" + "github.com/ooni/probe-cli/v3/internal/experiment/run" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/signal.go b/internal/registry/signal.go index 5d6f4e6bd4..9c568ce077 100644 --- a/internal/registry/signal.go +++ b/internal/registry/signal.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/signal" + "github.com/ooni/probe-cli/v3/internal/experiment/signal" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/simplequicping.go b/internal/registry/simplequicping.go index 5b002dda16..33bf29b65d 100644 --- a/internal/registry/simplequicping.go +++ b/internal/registry/simplequicping.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/simplequicping" + "github.com/ooni/probe-cli/v3/internal/experiment/simplequicping" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/sniblocking.go b/internal/registry/sniblocking.go index d3e08043f7..bda66d1805 100644 --- a/internal/registry/sniblocking.go +++ b/internal/registry/sniblocking.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/sniblocking" + "github.com/ooni/probe-cli/v3/internal/experiment/sniblocking" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/stunreachability.go b/internal/registry/stunreachability.go index 76181882c3..38ab7cf16f 100644 --- a/internal/registry/stunreachability.go +++ b/internal/registry/stunreachability.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/stunreachability" + "github.com/ooni/probe-cli/v3/internal/experiment/stunreachability" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/tcpping.go b/internal/registry/tcpping.go index 3769e32173..0be3933832 100644 --- a/internal/registry/tcpping.go +++ b/internal/registry/tcpping.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/tcpping" + "github.com/ooni/probe-cli/v3/internal/experiment/tcpping" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/telegram.go b/internal/registry/telegram.go index b31fdfb5dc..2218dfd248 100644 --- a/internal/registry/telegram.go +++ b/internal/registry/telegram.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/telegram" + "github.com/ooni/probe-cli/v3/internal/experiment/telegram" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/tlsmiddlebox.go b/internal/registry/tlsmiddlebox.go index 1a675ac8c8..4ca5733b12 100644 --- a/internal/registry/tlsmiddlebox.go +++ b/internal/registry/tlsmiddlebox.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/tlsmiddlebox" + "github.com/ooni/probe-cli/v3/internal/experiment/tlsmiddlebox" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/tlsping.go b/internal/registry/tlsping.go index 1273d0012d..862b3186d0 100644 --- a/internal/registry/tlsping.go +++ b/internal/registry/tlsping.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/tlsping" + "github.com/ooni/probe-cli/v3/internal/experiment/tlsping" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/tlstool.go b/internal/registry/tlstool.go index 6d7fb56883..ed2047ddbf 100644 --- a/internal/registry/tlstool.go +++ b/internal/registry/tlstool.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool" + "github.com/ooni/probe-cli/v3/internal/experiment/tlstool" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/tor.go b/internal/registry/tor.go index 408404a57f..e5dc81f212 100644 --- a/internal/registry/tor.go +++ b/internal/registry/tor.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/tor" + "github.com/ooni/probe-cli/v3/internal/experiment/tor" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/torsf.go b/internal/registry/torsf.go index 45dbaf16a4..38ef135151 100644 --- a/internal/registry/torsf.go +++ b/internal/registry/torsf.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/torsf" + "github.com/ooni/probe-cli/v3/internal/experiment/torsf" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/urlgetter.go b/internal/registry/urlgetter.go index afe441e409..8044af92ce 100644 --- a/internal/registry/urlgetter.go +++ b/internal/registry/urlgetter.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter" + "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/vanillator.go b/internal/registry/vanillator.go index 3dd44a6741..5f9d4fa36d 100644 --- a/internal/registry/vanillator.go +++ b/internal/registry/vanillator.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/vanillator" + "github.com/ooni/probe-cli/v3/internal/experiment/vanillator" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/webconnectivity.go b/internal/registry/webconnectivity.go index b286d8335b..ada8767417 100644 --- a/internal/registry/webconnectivity.go +++ b/internal/registry/webconnectivity.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" + "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/registry/whatsapp.go b/internal/registry/whatsapp.go index b6ae9bed32..9d82598260 100644 --- a/internal/registry/whatsapp.go +++ b/internal/registry/whatsapp.go @@ -5,7 +5,7 @@ package registry // import ( - "github.com/ooni/probe-cli/v3/internal/engine/experiment/whatsapp" + "github.com/ooni/probe-cli/v3/internal/experiment/whatsapp" "github.com/ooni/probe-cli/v3/internal/model" ) diff --git a/internal/tutorial/experiment/torsf/chapter01/main.go b/internal/tutorial/experiment/torsf/chapter01/main.go index e5dada1962..da8c5d67c5 100644 --- a/internal/tutorial/experiment/torsf/chapter01/main.go +++ b/internal/tutorial/experiment/torsf/chapter01/main.go @@ -56,7 +56,7 @@ import ( // The torsf package contains the implementation of the torsf experiment. // // ```Go - "github.com/ooni/probe-cli/v3/internal/engine/experiment/torsf" + "github.com/ooni/probe-cli/v3/internal/experiment/torsf" // ``` //