Refactor client-server interaction facilities

cmd/client/main.go

@@ -6,12 +6,11 @@ import (
 	"net"
 	"os"
 
-	"github.com/yezzey-gp/yproxy/pkg/storage"
-
 	"github.com/spf13/cobra"
 	"github.com/yezzey-gp/yproxy/config"
 	"github.com/yezzey-gp/yproxy/pkg/client"
 	"github.com/yezzey-gp/yproxy/pkg/message"
+	"github.com/yezzey-gp/yproxy/pkg/object"
 	"github.com/yezzey-gp/yproxy/pkg/proc"
 	"github.com/yezzey-gp/yproxy/pkg/ylogger"
 )
@@ -167,7 +166,7 @@ func listFunc(con net.Conn, instanceCnf *config.Instance, args []string) error {
 	r := proc.NewProtoReader(ycl)
 
 	done := false
-	res := make([]*storage.ObjectInfo, 0)
+	res := make([]*object.ObjectInfo, 0)
 	for {
 		if done {
 			break

pkg/message/object_meta_message.go

@@ -4,16 +4,16 @@ import (
 	"bytes"
 	"encoding/binary"
 
-	"github.com/yezzey-gp/yproxy/pkg/storage"
+	"github.com/yezzey-gp/yproxy/pkg/object"
 )
 
 type ObjectInfoMessage struct {
-	Content []*storage.ObjectInfo
+	Content []*object.ObjectInfo
 }
 
 var _ ProtoMessage = &ObjectInfoMessage{}
 
-func NewObjectMetaMessage(content []*storage.ObjectInfo) *ObjectInfoMessage {
+func NewObjectMetaMessage(content []*object.ObjectInfo) *ObjectInfoMessage {
 	return &ObjectInfoMessage{
 		Content: content,
 	}
@@ -44,12 +44,12 @@ func (c *ObjectInfoMessage) Encode() []byte {
 
 func (c *ObjectInfoMessage) Decode(body []byte) {
 	body = body[4:]
-	c.Content = make([]*storage.ObjectInfo, 0)
+	c.Content = make([]*object.ObjectInfo, 0)
 	for len(body) > 0 {
 		name, index := c.GetString(body)
 		size := int64(binary.BigEndian.Uint64(body[index : index+8]))
 
-		c.Content = append(c.Content, &storage.ObjectInfo{
+		c.Content = append(c.Content, &object.ObjectInfo{
 			Path: name,
 			Size: size,
 		})

pkg/object/objectInfo.go

@@ -0,0 +1,6 @@
+package object
+
+type ObjectInfo struct {
+	Path string
+	Size int64
+}

pkg/proc/delete_handler_test.go

@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/yezzey-gp/yproxy/pkg/message"
 	mock "github.com/yezzey-gp/yproxy/pkg/mock"
+	"github.com/yezzey-gp/yproxy/pkg/object"
 	"github.com/yezzey-gp/yproxy/pkg/proc"
-	"github.com/yezzey-gp/yproxy/pkg/storage"
 )
 
 func TestReworkingName(t *testing.T) {
@@ -60,7 +60,7 @@ func TestFilesToDeletion(t *testing.T) {
 		Confirm: false,
 	}
 
-	filesInStorage := []*storage.ObjectInfo{
+	filesInStorage := []*object.ObjectInfo{
 		{Path: "1663_16530_not-deleted_18002_"},
 		{Path: "1663_16530_deleted-after-backup_18002_"},
 		{Path: "1663_16530_deleted-when-backup-start_18002_"},