chore: remove nested internal package (#53)

We ended up with nested internal packages when we moved the coord package to internal. This change moves the nested internal packages up to the main internal package.
probe-lab · Oct 5, 2023 · d2e54d5 · d2e54d5
1 parent 4a89594
commit d2e54d5
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 12 deletions.
diff --git a/internal/coord/brdcst/brdcst_test.go b/internal/coord/brdcst/brdcst_test.go
@@ -3,7 +3,7 @@ package brdcst
 import (
 	"testing"
 
-	"github.com/plprobelab/zikade/internal/coord/internal/tiny"
+	"github.com/plprobelab/zikade/internal/tiny"
 )
 
 func TestBroadcastState_interface_conformance(t *testing.T) {

diff --git a/internal/coord/brdcst/pool_test.go b/internal/coord/brdcst/pool_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/plprobelab/zikade/internal/coord/coordt"
-	"github.com/plprobelab/zikade/internal/coord/internal/tiny"
+	"github.com/plprobelab/zikade/internal/tiny"
 )
 
 // Assert that Pool implements the common state machine interface

diff --git a/internal/coord/coordinator_test.go b/internal/coord/coordinator_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/plprobelab/zikade/internal/coord/coordt"
-	"github.com/plprobelab/zikade/internal/coord/internal/nettest"
 	"github.com/plprobelab/zikade/internal/kadtest"
+	"github.com/plprobelab/zikade/internal/nettest"
 	"github.com/plprobelab/zikade/kadt"
 	"github.com/plprobelab/zikade/pb"
 )

diff --git a/internal/coord/network_test.go b/internal/coord/network_test.go
@@ -8,8 +8,8 @@ import (
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/exp/slog"
 
-	"github.com/plprobelab/zikade/internal/coord/internal/nettest"
 	"github.com/plprobelab/zikade/internal/kadtest"
+	"github.com/plprobelab/zikade/internal/nettest"
 )
 
 // TODO: this is just a basic is-it-working test that needs to be improved

diff --git a/internal/coord/query/iter_test.go b/internal/coord/query/iter_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/plprobelab/go-libdht/kad/key"
 	"github.com/stretchr/testify/require"
 
-	"github.com/plprobelab/zikade/internal/coord/internal/tiny"
+	"github.com/plprobelab/zikade/internal/tiny"
 )
 
 var (

diff --git a/internal/coord/query/pool_test.go b/internal/coord/query/pool_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/plprobelab/zikade/internal/coord/coordt"
-	"github.com/plprobelab/zikade/internal/coord/internal/tiny"
+	"github.com/plprobelab/zikade/internal/tiny"
 )
 
 func TestPoolConfigValidate(t *testing.T) {

diff --git a/internal/coord/query/query_test.go b/internal/coord/query/query_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/plprobelab/zikade/internal/coord/coordt"
-	"github.com/plprobelab/zikade/internal/coord/internal/tiny"
+	"github.com/plprobelab/zikade/internal/tiny"
 )
 
 func TestQueryConfigValidate(t *testing.T) {

diff --git a/internal/coord/routing/bootstrap_test.go b/internal/coord/routing/bootstrap_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/plprobelab/zikade/internal/coord/coordt"
-	"github.com/plprobelab/zikade/internal/coord/internal/tiny"
+	"github.com/plprobelab/zikade/internal/tiny"
 )
 
 func TestBootstrapConfigValidate(t *testing.T) {

diff --git a/internal/coord/routing/explore_test.go b/internal/coord/routing/explore_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/plprobelab/zikade/internal/coord/internal/tiny"
+	"github.com/plprobelab/zikade/internal/tiny"
 )
 
 func TestExploreConfigValidate(t *testing.T) {

diff --git a/internal/coord/routing/include_test.go b/internal/coord/routing/include_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/plprobelab/go-libdht/kad/triert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/plprobelab/zikade/internal/coord/internal/tiny"
+	"github.com/plprobelab/zikade/internal/tiny"
 )
 
 func TestIncludeConfigValidate(t *testing.T) {

diff --git a/internal/coord/routing/probe_test.go b/internal/coord/routing/probe_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/plprobelab/go-libdht/kad/triert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/plprobelab/zikade/internal/coord/internal/tiny"
+	"github.com/plprobelab/zikade/internal/tiny"
 )
 
 var _ heap.Interface = (*nodeValuePendingList[tiny.Key, tiny.Node])(nil)

diff --git a/internal/coord/routing_test.go b/internal/coord/routing_test.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/plprobelab/zikade/internal/coord/coordt"
 	"github.com/plprobelab/zikade/internal/coord/cplutil"
-	"github.com/plprobelab/zikade/internal/coord/internal/nettest"
 	"github.com/plprobelab/zikade/internal/coord/routing"
 	"github.com/plprobelab/zikade/internal/kadtest"
+	"github.com/plprobelab/zikade/internal/nettest"
 	"github.com/plprobelab/zikade/kadt"
 )
 

diff --git a/internal/coord/internal/nettest/layouts.go → internal/nettest/layouts.go b/internal/coord/internal/nettest/layouts.go → internal/nettest/layouts.go
diff --git a/internal/coord/internal/nettest/routing.go → internal/nettest/routing.go b/internal/coord/internal/nettest/routing.go → internal/nettest/routing.go
diff --git a/internal/coord/internal/nettest/topology.go → internal/nettest/topology.go b/internal/coord/internal/nettest/topology.go → internal/nettest/topology.go
diff --git a/internal/coord/internal/tiny/node.go → internal/tiny/node.go b/internal/coord/internal/tiny/node.go → internal/tiny/node.go
diff --git a/internal/coord/internal/tiny/node_test.go → internal/tiny/node_test.go b/internal/coord/internal/tiny/node_test.go → internal/tiny/node_test.go