refactor: miniooni should be outside of the engine (#206)

* refactor: miniooni should be outside of the engine

This is part of https://github.com/ooni/probe/issues/1335. We also need
to think whether we wanna keep libminiooni and miniooni separated.

The previous use case for having a top-level libminiooni was that of
enabling others to integrate miniooni into other binaries.

This was usegul when studying internet censorship in Spain in May 2020.

I am wondering whether we should be keeping this complexity. I am not
sure about this and probably we should be killing it.

(In any case, reducing complexity is not the objective of this diff,
since I would like instead to move things around with minimal changes
and make sure we have a ~good repository organization here.)

* fix: import in libminiooni

.gitignore

@@ -3,6 +3,8 @@
 /*.tar.gz
 /*.zip
 /coverage.cov
+/miniooni
+/miniooni.exe
 /ooniprobe
 /ooniprobe.exe
 /ooniprobe_checksums.txt

build-miniooni.sh

@@ -3,27 +3,27 @@ set -e
 case $1 in
   macos|darwin)
     export GOOS=darwin GOARCH=amd64
-    go build -o ./CLI/darwin/amd64 -ldflags="-s -w" ./internal/engine/cmd/miniooni
+    go build -o ./CLI/darwin/amd64 -ldflags="-s -w" ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/darwin/amd64/miniooni";;
   linux)
     export GOOS=linux GOARCH=386
-    go build -o ./CLI/linux/386 -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/engine/cmd/miniooni
+    go build -o ./CLI/linux/386 -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/linux/386/miniooni"
     export GOOS=linux GOARCH=amd64
-    go build -o ./CLI/linux/amd64 -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/engine/cmd/miniooni
+    go build -o ./CLI/linux/amd64 -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/linux/amd64/miniooni"
     export GOOS=linux GOARCH=arm GOARM=7
-    go build -o ./CLI/linux/arm -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/engine/cmd/miniooni
+    go build -o ./CLI/linux/arm -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/linux/arm/miniooni"
     export GOOS=linux GOARCH=arm64
-    go build -o ./CLI/linux/arm64 -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/engine/cmd/miniooni
+    go build -o ./CLI/linux/arm64 -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/linux/arm64/miniooni";;
   windows)
     export GOOS=windows GOARCH=386
-    go build -o ./CLI/windows/386 -ldflags="-s -w" ./internal/engine/cmd/miniooni
+    go build -o ./CLI/windows/386 -ldflags="-s -w" ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/windows/386/miniooni.exe"
     export GOOS=windows GOARCH=amd64
-    go build -o ./CLI/windows/amd64 -ldflags="-s -w" ./internal/engine/cmd/miniooni
+    go build -o ./CLI/windows/amd64 -ldflags="-s -w" ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/windows/amd64/miniooni.exe";;
   *)
     echo "usage: $0 darwin|linux|windows" 1>&2

internal/cmd/miniooni/main.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/libminiooni"
+	"github.com/ooni/probe-cli/v3/internal/libminiooni"
 )
 
 func main() {

internal/engine/experiment/dash/dash.go

@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/montanaflynn/stats"
-	"github.com/ooni/probe-cli/v3/internal/engine/internal/humanizex"
+	"github.com/ooni/probe-cli/v3/internal/engine/humanizex"
 	"github.com/ooni/probe-cli/v3/internal/engine/model"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx/errorx"

internal/engine/experiment/ndt7/ndt7.go

@@ -11,7 +11,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/internal/humanizex"
+	"github.com/ooni/probe-cli/v3/internal/engine/humanizex"
 	"github.com/ooni/probe-cli/v3/internal/engine/internal/mlablocatev2"
 	"github.com/ooni/probe-cli/v3/internal/engine/model"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx"

internal/engine/humanizex/humanizex_test.go

@@ -3,7 +3,7 @@ package humanizex_test
 import (
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/internal/humanizex"
+	"github.com/ooni/probe-cli/v3/internal/engine/humanizex"
 )
 
 func TestGood(t *testing.T) {

internal/libminiooni/libminiooni.go

@@ -28,8 +28,8 @@ import (
 	"time"
 
 	"github.com/apex/log"
-	engine "github.com/ooni/probe-cli/v3/internal/engine"
+	"github.com/ooni/probe-cli/v3/internal/engine"
-	"github.com/ooni/probe-cli/v3/internal/engine/internal/humanizex"
+	"github.com/ooni/probe-cli/v3/internal/engine/humanizex"
 	"github.com/ooni/probe-cli/v3/internal/engine/model"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx/selfcensor"
 	"github.com/ooni/probe-cli/v3/internal/engine/version"

internal/libminiooni/libminiooni_integration_test.go

@@ -3,7 +3,7 @@ package libminiooni_test
 import (
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/libminiooni"
+	"github.com/ooni/probe-cli/v3/internal/libminiooni"
 )
 
 func TestSimple(t *testing.T) {