From 40eae221099b5c4bd872ab4331d22cae3a92f364 Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <e.stratonikov@yadro.com>
Date: Fri, 30 Dec 2022 18:01:51 +0300
Subject: [PATCH] [#460] services/util: Remove `CreateRequestStreamer`

There is no need in a wrapper with many from-`interface{}` conversions.

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
---
 pkg/services/object/response.go             | 24 +++++------
 pkg/services/util/response/client_stream.go | 48 ---------------------
 2 files changed, 11 insertions(+), 61 deletions(-)
 delete mode 100644 pkg/services/util/response/client_stream.go

diff --git a/pkg/services/object/response.go b/pkg/services/object/response.go
index 0bec72163..81d6aaaaf 100644
--- a/pkg/services/object/response.go
+++ b/pkg/services/object/response.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util/response"
 )
 
@@ -34,7 +33,8 @@ type getRangeStreamResponser struct {
 }
 
 type putStreamResponser struct {
-	stream *response.ClientMessageStreamer
+	stream  PutObjectStream
+	respSvc *response.Service
 }
 
 // NewResponseService returns object service instance that passes internal service
@@ -59,16 +59,20 @@ func (s *ResponseService) Get(req *object.GetRequest, stream GetObjectStream) er
 }
 
 func (s *putStreamResponser) Send(ctx context.Context, req *object.PutRequest) error {
-	return s.stream.Send(ctx, req)
+	if err := s.stream.Send(ctx, req); err != nil {
+		return fmt.Errorf("could not send the request: %w", err)
+	}
+	return nil
 }
 
 func (s *putStreamResponser) CloseAndRecv(ctx context.Context) (*object.PutResponse, error) {
 	r, err := s.stream.CloseAndRecv(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("(%T) could not receive response: %w", s, err)
+		return nil, fmt.Errorf("could not close stream and receive response: %w", err)
 	}
 
-	return r.(*object.PutResponse), nil
+	s.respSvc.SetMeta(r)
+	return r, nil
 }
 
 func (s *ResponseService) Put() (PutObjectStream, error) {
@@ -78,14 +82,8 @@ func (s *ResponseService) Put() (PutObjectStream, error) {
 	}
 
 	return &putStreamResponser{
-		stream: s.respSvc.CreateRequestStreamer(
-			func(ctx context.Context, req any) error {
-				return stream.Send(ctx, req.(*object.PutRequest))
-			},
-			func(ctx context.Context) (util.ResponseMessage, error) {
-				return stream.CloseAndRecv(ctx)
-			},
-		),
+		stream:  stream,
+		respSvc: s.respSvc,
 	}, nil
 }
 
diff --git a/pkg/services/util/response/client_stream.go b/pkg/services/util/response/client_stream.go
deleted file mode 100644
index 962f2bc26..000000000
--- a/pkg/services/util/response/client_stream.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package response
-
-import (
-	"context"
-	"fmt"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util"
-)
-
-// ClientMessageStreamer represents client-side message streamer
-// that sets meta values to the response.
-type ClientMessageStreamer struct {
-	srv *Service
-
-	send util.RequestMessageWriter
-
-	close util.ClientStreamCloser
-}
-
-// Send calls send method of internal streamer.
-func (s *ClientMessageStreamer) Send(ctx context.Context, req any) error {
-	if err := s.send(ctx, req); err != nil {
-		return fmt.Errorf("(%T) could not send the request: %w", s, err)
-	}
-	return nil
-}
-
-// CloseAndRecv closes internal stream, receivers the response,
-// sets meta values and returns the result.
-func (s *ClientMessageStreamer) CloseAndRecv(ctx context.Context) (util.ResponseMessage, error) {
-	resp, err := s.close(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("(%T) could not close stream and receive response: %w", s, err)
-	}
-
-	s.srv.SetMeta(resp)
-
-	return resp, nil
-}
-
-// CreateRequestStreamer wraps stream methods and returns ClientMessageStreamer instance.
-func (s *Service) CreateRequestStreamer(sender util.RequestMessageWriter, closer util.ClientStreamCloser) *ClientMessageStreamer {
-	return &ClientMessageStreamer{
-		srv:   s,
-		send:  sender,
-		close: closer,
-	}
-}
-- 
2.45.2