cleanup: move legacy from internal/engine to internal (#759)

No functional change. See ooni/probe#2115
ooni · May 25, 2022 · 8b0815e · 8b0815e
1 parent 2d721ba
commit 8b0815e
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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
diff --git a/...rnal/engine/legacy/assetsdir/assetsdir.go → internal/legacy/assetsdir/assetsdir.go b/...rnal/engine/legacy/assetsdir/assetsdir.go → internal/legacy/assetsdir/assetsdir.go
diff --git a/...engine/legacy/assetsdir/assetsdir_test.go → internal/legacy/assetsdir/assetsdir_test.go b/...engine/legacy/assetsdir/assetsdir_test.go → internal/legacy/assetsdir/assetsdir_test.go
diff --git 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"
 )