refactor: we don't wanna export pkg/oonimkall/tasks (ooni#216)

* doc: merge the engine and the cli readmes Part of ooni/probe#1335 * refactor: we don't wanna export pkg/oonimkall/tasks See ooni/probe#1335
ainghazal · Feb 3, 2021 · 8f97784 · 8f97784
1 parent 8e5cc72
commit 8f97784
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 4 deletions.
diff --git a/pkg/oonimkall/.gitignore b/pkg/oonimkall/.gitignore
@@ -0,0 +1 @@
+/testdata
diff --git a/pkg/oonimkall/tasks/chanlogger.go → pkg/oonimkall/internal/tasks/chanlogger.go b/pkg/oonimkall/tasks/chanlogger.go → pkg/oonimkall/internal/tasks/chanlogger.go
diff --git a/pkg/oonimkall/tasks/event.go → pkg/oonimkall/internal/tasks/event.go b/pkg/oonimkall/tasks/event.go → pkg/oonimkall/internal/tasks/event.go
diff --git a/pkg/oonimkall/tasks/eventemitter.go → pkg/oonimkall/internal/tasks/eventemitter.go b/pkg/oonimkall/tasks/eventemitter.go → pkg/oonimkall/internal/tasks/eventemitter.go
diff --git a/pkg/oonimkall/tasks/eventemitter_test.go → ...mkall/internal/tasks/eventemitter_test.go b/pkg/oonimkall/tasks/eventemitter_test.go → ...mkall/internal/tasks/eventemitter_test.go
@@ -3,7 +3,7 @@ package tasks_test
 import (
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/pkg/oonimkall/tasks"
+	"github.com/ooni/probe-cli/v3/pkg/oonimkall/internal/tasks"
 )
 
 func TestDisabledEvents(t *testing.T) {

diff --git a/pkg/oonimkall/tasks/runner.go → pkg/oonimkall/internal/tasks/runner.go b/pkg/oonimkall/tasks/runner.go → pkg/oonimkall/internal/tasks/runner.go
diff --git a/...onimkall/tasks/runner_integration_test.go → ...internal/tasks/runner_integration_test.go b/...onimkall/tasks/runner_integration_test.go → ...internal/tasks/runner_integration_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/pkg/oonimkall/tasks"
+	"github.com/ooni/probe-cli/v3/pkg/oonimkall/internal/tasks"
 )
 
 func TestRunnerMaybeLookupBackendsFailure(t *testing.T) {

diff --git a/pkg/oonimkall/tasks/runner_internal_test.go → ...ll/internal/tasks/runner_internal_test.go b/pkg/oonimkall/tasks/runner_internal_test.go → ...ll/internal/tasks/runner_internal_test.go
diff --git a/pkg/oonimkall/tasks/settings.go → pkg/oonimkall/internal/tasks/settings.go b/pkg/oonimkall/tasks/settings.go → pkg/oonimkall/internal/tasks/settings.go
diff --git a/pkg/oonimkall/task.go b/pkg/oonimkall/task.go
@@ -45,7 +45,7 @@ import (
 
 	"github.com/ooni/probe-cli/v3/internal/engine/atomicx"
 	"github.com/ooni/probe-cli/v3/internal/engine/runtimex"
-	"github.com/ooni/probe-cli/v3/pkg/oonimkall/tasks"
+	"github.com/ooni/probe-cli/v3/pkg/oonimkall/internal/tasks"
 )
 
 // Task is an asynchronous task running an experiment. It mimics the

diff --git a/pkg/oonimkall/task_integration_test.go b/pkg/oonimkall/task_integration_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/ooni/probe-cli/v3/internal/engine/model"
 	"github.com/ooni/probe-cli/v3/pkg/oonimkall"
-	"github.com/ooni/probe-cli/v3/pkg/oonimkall/tasks"
+	"github.com/ooni/probe-cli/v3/pkg/oonimkall/internal/tasks"
 )
 
 type eventlike struct {