node: Use github.com/nspcc-dev/neofs-api-go/v2 module less

cmd/neofs-node/transport.go

@@ -5,13 +5,12 @@
 	"fmt"
 
 	objectGRPC "github.com/nspcc-dev/neofs-api-go/v2/object/grpc"
-	rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
-	"github.com/nspcc-dev/neofs-api-go/v2/rpc/common"
-	"github.com/nspcc-dev/neofs-api-go/v2/rpc/grpc"
-	"github.com/nspcc-dev/neofs-api-go/v2/rpc/message"
 	"github.com/nspcc-dev/neofs-api-go/v2/status"
 	coreclient "github.com/nspcc-dev/neofs-node/pkg/core/client"
 	apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/encoding"
+	"google.golang.org/grpc/encoding/proto"
 )
 
 type transport struct {
@@ -26,49 +25,60 @@
 		return nil, fmt.Errorf("connect to remote node: %w", err)
 	}
 
-	var resp replicateResponse
-	err = c.ExecRaw(func(c *rawclient.Client) error {
+	var resp objectGRPC.ReplicateResponse
+	err = c.ExecRaw(func(conn *grpc.ClientConn) error {
 		// this will be changed during NeoFS API Go deprecation. Code most likely be
 		// placed in SDK
-		m := common.CallMethodInfo{Service: "neo.fs.v2.object.ObjectService", Name: "Replicate"}
-		err = rawclient.SendUnary(c, m, rawclient.BinaryMessage(req), &resp,
-			rawclient.WithContext(ctx), rawclient.AllowBinarySendingOnly())
+		err = conn.Invoke(ctx, objectGRPC.ObjectService_Replicate_FullMethodName, req, &resp, binaryMessageOnly)
 		if err != nil {
-			return fmt.Errorf("API transport (service=%s,op=%s): %w", m.Service, m.Name, err)
+			return fmt.Errorf("API transport (op=%s): %w", objectGRPC.ObjectService_Replicate_FullMethodName, err)
 		}
-		return resp.err
+		return err
 	})
-	return resp.sigs, err
-}
+	if err != nil {
+		return nil, err
+	}
 
-type replicateResponse struct {
-	sigs []byte
-	err  error
+	return replicationResultFromResponse(&resp)
 }
 
-func (x replicateResponse) ToGRPCMessage() grpc.Message { return new(objectGRPC.ReplicateResponse) }
+// [encoding.Codec] making Marshal to accept and forward []byte messages only.
+var binaryMessageOnly = grpc.ForceCodec(protoCodecBinaryRequestOnly{})
+
+type protoCodecBinaryRequestOnly struct{}
+
+func (protoCodecBinaryRequestOnly) Name() string {
+	// may be any non-empty, conflicts are unlikely to arise
+	return "neofs_binary_sender"
+}
 
-func (x *replicateResponse) FromGRPCMessage(gm grpc.Message) error {
-	m, ok := gm.(*objectGRPC.ReplicateResponse)
-	if !ok {
-		return message.NewUnexpectedMessageType(gm, m)
+func (protoCodecBinaryRequestOnly) Marshal(msg any) ([]byte, error) {
+	bMsg, ok := msg.([]byte)
+	if ok {
+		return bMsg, nil
 	}
 
+	return nil, fmt.Errorf("message is not of type %T", bMsg)
+}
+
+func (protoCodecBinaryRequestOnly) Unmarshal(raw []byte, msg any) error {
+	return encoding.GetCodec(proto.Name).Unmarshal(raw, msg)
+}
+
+func replicationResultFromResponse(m *objectGRPC.ReplicateResponse) ([]byte, error) {
 	var st *status.Status
 	if mst := m.GetStatus(); mst != nil {
 		st = new(status.Status)
 		err := st.FromGRPCMessage(mst)
 		if err != nil {
-			return fmt.Errorf("decode response status: %w", err)
+			return nil, fmt.Errorf("decode response status: %w", err)
 		}
 	}
 
-	x.err = apistatus.ErrorFromV2(st)
-	if x.err != nil {
-		return nil
+	err := apistatus.ErrorFromV2(st)
+	if err != nil {
+		return nil, err
 	}
 
-	x.sigs = m.GetObjectSignature()
-
-	return nil
+	return m.GetObjectSignature(), nil
 }

pkg/core/client/client.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"io"
 
-	rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
 	"github.com/nspcc-dev/neofs-node/pkg/network"
 	"github.com/nspcc-dev/neofs-sdk-go/client"
 	"github.com/nspcc-dev/neofs-sdk-go/container"
@@ -14,6 +13,7 @@ import (
 	oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
 	reputationSDK "github.com/nspcc-dev/neofs-sdk-go/reputation"
 	"github.com/nspcc-dev/neofs-sdk-go/user"
+	"google.golang.org/grpc"
 )
 
 // Client is an interface of NeoFS storage
@@ -30,7 +30,7 @@ type Client interface {
 	ObjectHash(ctx context.Context, containerID cid.ID, objectID oid.ID, signer user.Signer, prm client.PrmObjectHash) ([][]byte, error)
 	AnnounceLocalTrust(ctx context.Context, epoch uint64, trusts []reputationSDK.Trust, prm client.PrmAnnounceLocalTrust) error
 	AnnounceIntermediateTrust(ctx context.Context, epoch uint64, trust reputationSDK.PeerToPeerTrust, prm client.PrmAnnounceIntermediateTrust) error
-	ExecRaw(f func(client *rawclient.Client) error) error
+	ExecRaw(f func(*grpc.ClientConn) error) error
 	Close() error
 }
 
@@ -39,9 +39,9 @@ type Client interface {
 type MultiAddressClient interface {
 	Client
 
-	// RawForAddress must return rawclient.Client
-	// for the passed network.Address.
-	RawForAddress(network.Address, func(cli *rawclient.Client) error) error
+	// RawForAddress executes op over gRPC connections to given multi-address
+	// endpoint-by-endpoint until success.
+	RawForAddress(multiAddr network.Address, op func(*grpc.ClientConn) error) error
 
 	ReportError(error)
 }

pkg/local_object_storage/shard/gc_test.go

@@ -9,7 +9,6 @@ import (
 	"testing"
 	"time"
 
-	objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object"
 	objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object"
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor"
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree"
@@ -84,7 +83,7 @@ func TestGC_ExpiredObjectWithExpiredLock(t *testing.T) {
 	cnr := cidtest.ID()
 
 	var expAttr object.Attribute
-	expAttr.SetKey(objectV2.SysAttributeExpEpoch)
+	expAttr.SetKey(object.AttributeExpirationEpoch)
 	expAttr.SetValue("1")
 
 	obj := generateObjectWithCID(cnr)
@@ -211,7 +210,7 @@ func TestExpiration(t *testing.T) {
 	ch := sh.NotificationChannel()
 
 	var expAttr object.Attribute
-	expAttr.SetKey(objectV2.SysAttributeExpEpoch)
+	expAttr.SetKey(object.AttributeExpirationEpoch)
 
 	obj := generateObject()
 

pkg/network/address.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
-	"github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
+	"github.com/nspcc-dev/neofs-node/internal/uriutil"
 )
 
 /*
@@ -69,7 +69,7 @@ func (a *Address) FromString(s string) error {
 			host   string
 			hasTLS bool
 		)
-		host, hasTLS, err = client.ParseURI(s)
+		host, hasTLS, err = uriutil.Parse(s)
 		if err != nil {
 			host = s
 		}

pkg/network/cache/multi.go

@@ -21,6 +21,7 @@
 	reputationSDK "github.com/nspcc-dev/neofs-sdk-go/reputation"
 	"github.com/nspcc-dev/neofs-sdk-go/user"
 	"go.uber.org/zap"
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
@@ -56,6 +57,20 @@
 	}
 }
 
+type clientWrapper struct {
+	*client.Client
+}
+
+func (x clientWrapper) ExecRaw(f func(*grpc.ClientConn) error) error {
+	return x.Client.ExecRaw(func(c *rawclient.Client) error {
+		conn := c.Conn()
+		if conn == nil {
+			return errors.New("missing conn")
+		}
+		return f(conn.(*grpc.ClientConn))
+	})
+}
+
 func (x *multiClient) createForAddress(addr network.Address) (clientcore.Client, error) {
 	var (
 		prmInit client.PrmInit
@@ -88,7 +103,7 @@
 		return nil, fmt.Errorf("can't init SDK client: %w", err)
 	}
 
-	return c, nil
+	return clientWrapper{c}, nil
 }
 
 // updateGroup replaces current multiClient addresses with a new group.
@@ -329,7 +344,7 @@
 	})
 }
 
-func (x *multiClient) ExecRaw(f func(client *rawclient.Client) error) error {
+func (x *multiClient) ExecRaw(f func(*grpc.ClientConn) error) error {
 	return x.iterateClients(context.Background(), func(c clientcore.Client) error {
 		return c.ExecRaw(f)
 	})
@@ -351,7 +366,7 @@
 	return nil
 }
 
-func (x *multiClient) RawForAddress(addr network.Address, f func(client *rawclient.Client) error) error {
+func (x *multiClient) RawForAddress(addr network.Address, f func(*grpc.ClientConn) error) error {
 	c, err := x.client(addr)
 	if err != nil {
 		return err