diff --git a/cmd/ooniprobe/internal/ooni/ooni.go b/cmd/ooniprobe/internal/ooni/ooni.go index 5be0f6261d..9bc541a415 100644 --- a/cmd/ooniprobe/internal/ooni/ooni.go +++ b/cmd/ooniprobe/internal/ooni/ooni.go @@ -15,8 +15,8 @@ import ( "github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils" "github.com/ooni/probe-cli/v3/internal/atomicx" "github.com/ooni/probe-cli/v3/internal/engine" - "github.com/ooni/probe-cli/v3/internal/engine/legacy/assetsdir" "github.com/ooni/probe-cli/v3/internal/kvstore" + "github.com/ooni/probe-cli/v3/internal/legacy/assetsdir" "github.com/ooni/probe-cli/v3/internal/model" "github.com/pkg/errors" "github.com/upper/db/v4" diff --git a/internal/cmd/miniooni/libminiooni.go b/internal/cmd/miniooni/libminiooni.go index 0c78bc86ce..5844c0c4cd 100644 --- a/internal/cmd/miniooni/libminiooni.go +++ b/internal/cmd/miniooni/libminiooni.go @@ -16,9 +16,9 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/v3/internal/engine" - "github.com/ooni/probe-cli/v3/internal/engine/legacy/assetsdir" "github.com/ooni/probe-cli/v3/internal/humanize" "github.com/ooni/probe-cli/v3/internal/kvstore" + "github.com/ooni/probe-cli/v3/internal/legacy/assetsdir" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/netxlite/filtering" diff --git a/internal/engine/legacy/README.md b/internal/engine/legacy/README.md deleted file mode 100644 index 3cfc905e10..0000000000 --- a/internal/engine/legacy/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Package github.com/ooni/probe-engine/legacy - -This package contains legacy code that we will soon remove. When this folder -is empty, it means there's no large, incremental refactoring in progress. diff --git a/internal/engine/legacy/assetsdir/assetsdir.go b/internal/legacy/assetsdir/assetsdir.go similarity index 100% rename from internal/engine/legacy/assetsdir/assetsdir.go rename to internal/legacy/assetsdir/assetsdir.go diff --git a/internal/engine/legacy/assetsdir/assetsdir_test.go b/internal/legacy/assetsdir/assetsdir_test.go similarity index 100% rename from internal/engine/legacy/assetsdir/assetsdir_test.go rename to internal/legacy/assetsdir/assetsdir_test.go diff --git a/pkg/oonimkall/session.go b/pkg/oonimkall/session.go index 85c4ed5abd..34b2648861 100644 --- a/pkg/oonimkall/session.go +++ b/pkg/oonimkall/session.go @@ -10,9 +10,9 @@ import ( "github.com/ooni/probe-cli/v3/internal/atomicx" "github.com/ooni/probe-cli/v3/internal/engine" - "github.com/ooni/probe-cli/v3/internal/engine/legacy/assetsdir" "github.com/ooni/probe-cli/v3/internal/engine/probeservices" "github.com/ooni/probe-cli/v3/internal/kvstore" + "github.com/ooni/probe-cli/v3/internal/legacy/assetsdir" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" )