3 files changed, 5 insertions, 7 deletions
diff --git a/plugins/memory/kv.go b/plugins/memory/kv.go
index c13c2314..68ea7266 100644
--- a/plugins/memory/kv.go
+++ b/plugins/memory/kv.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/spiral/errors"
 	"github.com/spiral/roadrunner/v2/plugins/config"
-	"github.com/spiral/roadrunner/v2/plugins/kv"
 	"github.com/spiral/roadrunner/v2/plugins/logger"
 	kvv1 "github.com/spiral/roadrunner/v2/proto/kv/v1beta"
 )
@@ -21,7 +20,7 @@ type Driver struct {
 	cfg  *Config
 }
 
-func NewInMemoryDriver(log logger.Logger, key string, cfgPlugin config.Configurer, stop chan struct{}) (kv.Storage, error) {
+func NewInMemoryDriver(log logger.Logger, key string, cfgPlugin config.Configurer, stop chan struct{}) (*Driver, error) {
 	const op = errors.Op("new_in_memory_driver")
 
 	d := &Driver{
diff --git a/plugins/memory/plugin.go b/plugins/memory/plugin.go
index 70badf15..7d418a70 100644
--- a/plugins/memory/plugin.go
+++ b/plugins/memory/plugin.go
@@ -2,9 +2,9 @@ package memory
 
 import (
 	"github.com/spiral/errors"
-	"github.com/spiral/roadrunner/v2/pkg/pubsub"
+	"github.com/spiral/roadrunner/v2/common/kv"
+	"github.com/spiral/roadrunner/v2/common/pubsub"
 	"github.com/spiral/roadrunner/v2/plugins/config"
-	"github.com/spiral/roadrunner/v2/plugins/kv"
 	"github.com/spiral/roadrunner/v2/plugins/logger"
 )
 
@@ -21,7 +21,6 @@ type Plugin struct {
 
 func (p *Plugin) Init(log logger.Logger, cfg config.Configurer) error {
 	p.log = log
-	p.log = log
 	p.cfgPlugin = cfg
 	p.stop = make(chan struct{}, 1)
 	return nil
diff --git a/plugins/memory/pubsub.go b/plugins/memory/pubsub.go
index d027a8a5..c79f3eb0 100644
--- a/plugins/memory/pubsub.go
+++ b/plugins/memory/pubsub.go
@@ -3,8 +3,8 @@ package memory
 import (
 	"sync"
 
+	"github.com/spiral/roadrunner/v2/common/pubsub"
 	"github.com/spiral/roadrunner/v2/pkg/bst"
-	"github.com/spiral/roadrunner/v2/pkg/pubsub"
 	"github.com/spiral/roadrunner/v2/plugins/logger"
 )
 
@@ -17,7 +17,7 @@ type PubSubDriver struct {
 	log     logger.Logger
 }
 
-func NewPubSubDriver(log logger.Logger, _ string) (pubsub.PubSub, error) {
+func NewPubSubDriver(log logger.Logger, _ string) (*PubSubDriver, error) {
 	ps := &PubSubDriver{
 		pushCh:  make(chan *pubsub.Message, 10),
 		storage: bst.NewBST(),