huge refactor

3 files changed, 21 insertions, 14 deletions

diff --git a/plugins/server/tests/plugin_pipes.go b/plugins/server/tests/plugin_pipes.go
index fbd37e12..61c9a8f9 100644
--- a/plugins/server/tests/plugin_pipes.go
+++ b/plugins/server/tests/plugin_pipes.go
@@ -5,8 +5,11 @@ import (
 	"time"
 
 	"github.com/spiral/errors"
-	"github.com/spiral/roadrunner/v2"
+	"github.com/spiral/roadrunner/v2/interfaces/pool"
 	"github.com/spiral/roadrunner/v2/interfaces/server"
+	"github.com/spiral/roadrunner/v2/internal"
+	poolImpl "github.com/spiral/roadrunner/v2/pkg/pool"
+	"github.com/spiral/roadrunner/v2/pkg/worker"
 	"github.com/spiral/roadrunner/v2/plugins/config"
 	plugin "github.com/spiral/roadrunner/v2/plugins/server"
 )
@@ -14,12 +17,12 @@ import (
 const ConfigSection = "server"
 const Response = "test"
 
-var testPoolConfig = roadrunner.PoolConfig{
+var testPoolConfig = poolImpl.Config{
 	NumWorkers:      10,
 	MaxJobs:         100,
 	AllocateTimeout: time.Second * 10,
 	DestroyTimeout:  time.Second * 10,
-	Supervisor: &roadrunner.SupervisorConfig{
+	Supervisor: &poolImpl.SupervisorConfig{
 		WatchTick:       60,
 		TTL:             1000,
 		IdleTTL:         10,
@@ -31,7 +34,7 @@ var testPoolConfig = roadrunner.PoolConfig{
 type Foo struct {
 	configProvider config.Configurer
 	wf             server.Server
-	pool           roadrunner.Pool
+	pool           pool.Pool
 }
 
 func (f *Foo) Init(p config.Configurer, workerFactory server.Server) error {
@@ -44,7 +47,7 @@ func (f *Foo) Serve() chan error {
 	const op = errors.Op("serve")
 
 	// test payload for echo
-	r := roadrunner.Payload{
+	r := internal.Payload{
 		Context: nil,
 		Body:    []byte(Response),
 	}
@@ -78,7 +81,7 @@ func (f *Foo) Serve() chan error {
 	}
 
 	// test that our worker is functional
-	sw, err := roadrunner.NewSyncWorker(w)
+	sw, err := worker.From(w)
 	if err != nil {
 		errCh <- err
 		return errCh
diff --git a/plugins/server/tests/plugin_sockets.go b/plugins/server/tests/plugin_sockets.go
index 4942d4c5..3b97efff 100644
--- a/plugins/server/tests/plugin_sockets.go
+++ b/plugins/server/tests/plugin_sockets.go
@@ -4,8 +4,10 @@ import (
 	"context"
 
 	"github.com/spiral/errors"
-	"github.com/spiral/roadrunner/v2"
+	"github.com/spiral/roadrunner/v2/interfaces/pool"
 	"github.com/spiral/roadrunner/v2/interfaces/server"
+	"github.com/spiral/roadrunner/v2/internal"
+	"github.com/spiral/roadrunner/v2/pkg/worker"
 	"github.com/spiral/roadrunner/v2/plugins/config"
 	plugin "github.com/spiral/roadrunner/v2/plugins/server"
 )
@@ -13,7 +15,7 @@ import (
 type Foo2 struct {
 	configProvider config.Configurer
 	wf             server.Server
-	pool           roadrunner.Pool
+	pool           pool.Pool
 }
 
 func (f *Foo2) Init(p config.Configurer, workerFactory server.Server) error {
@@ -29,7 +31,7 @@ func (f *Foo2) Serve() chan error {
 	conf := &plugin.Config{}
 
 	// test payload for echo
-	r := roadrunner.Payload{
+	r := internal.Payload{
 		Context: nil,
 		Body:    []byte(Response),
 	}
@@ -59,7 +61,7 @@ func (f *Foo2) Serve() chan error {
 	}
 
 	// test that our worker is functional
-	sw, err := roadrunner.NewSyncWorker(w)
+	sw, err := worker.From(w)
 	if err != nil {
 		errCh <- err
 		return errCh
diff --git a/plugins/server/tests/plugin_tcp.go b/plugins/server/tests/plugin_tcp.go
index 89757a02..2857dadc 100644
--- a/plugins/server/tests/plugin_tcp.go
+++ b/plugins/server/tests/plugin_tcp.go
@@ -4,8 +4,10 @@ import (
 	"context"
 
 	"github.com/spiral/errors"
-	"github.com/spiral/roadrunner/v2"
+	"github.com/spiral/roadrunner/v2/interfaces/pool"
 	"github.com/spiral/roadrunner/v2/interfaces/server"
+	"github.com/spiral/roadrunner/v2/internal"
+	"github.com/spiral/roadrunner/v2/pkg/worker"
 	"github.com/spiral/roadrunner/v2/plugins/config"
 	plugin "github.com/spiral/roadrunner/v2/plugins/server"
 )
@@ -13,7 +15,7 @@ import (
 type Foo3 struct {
 	configProvider config.Configurer
 	wf             server.Server
-	pool           roadrunner.Pool
+	pool           pool.Pool
 }
 
 func (f *Foo3) Init(p config.Configurer, workerFactory server.Server) error {
@@ -29,7 +31,7 @@ func (f *Foo3) Serve() chan error {
 	conf := &plugin.Config{}
 
 	// test payload for echo
-	r := roadrunner.Payload{
+	r := internal.Payload{
 		Context: nil,
 		Body:    []byte(Response),
 	}
@@ -59,7 +61,7 @@ func (f *Foo3) Serve() chan error {
 	}
 
 	// test that our worker is functional
-	sw, err := roadrunner.NewSyncWorker(w)
+	sw, err := worker.From(w)
 	if err != nil {
 		errCh <- err
 		return errCh