sn/container: Refactor Client.Put() method input

This will make it easier to support nspcc-dev/neofs-contract#534.

Signed-off-by: Leonard Lyubich <leonard@morphbits.io>

Author: cthulhu-rider

cmd/neofs-node/container.go

@@ -385,20 +385,13 @@ func (x *containersInChain) List(id user.ID) ([]cid.ID, error) {
 }
 
 func (x *containersInChain) Put(cnr containerSDK.Container, pub, sig []byte, st *session.Container) (cid.ID, error) {
-	d := cnr.ReadDomain()
-
 	var prm cntClient.PutPrm
-	prm.SetContainer(cnr.Marshal())
-	prm.SetName(d.Name())
-	prm.SetZone(d.Zone())
+	prm.SetContainer(cnr)
 	prm.SetKey(pub)
 	prm.SetSignature(sig)
 	if st != nil {
 		prm.SetToken(st.Marshal())
 	}
-	if v := cnr.Attribute("__NEOFS__METAINFO_CONSISTENCY"); v == "optimistic" || v == "strict" {
-		prm.EnableMeta()
-	}
 
 	return x.cCli.Put(prm)
 }

pkg/morph/client/container/put.go

@@ -5,24 +5,22 @@ import (
 
 	"github.com/nspcc-dev/neofs-node/pkg/morph/client"
 	fschaincontracts "github.com/nspcc-dev/neofs-node/pkg/morph/contracts"
+	"github.com/nspcc-dev/neofs-sdk-go/container"
 	cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
 )
 
 // PutPrm groups parameters of Put operation.
 type PutPrm struct {
-	cnr               []byte
-	key               []byte
-	sig               []byte
-	token             []byte
-	name              string
-	zone              string
-	enableMetaOnChain bool
+	cnr   container.Container
+	key   []byte
+	sig   []byte
+	token []byte
 
 	client.InvokePrmOptional
 }
 
-// SetContainer sets container data.
-func (p *PutPrm) SetContainer(cnr []byte) {
+// SetContainer sets container.
+func (p *PutPrm) SetContainer(cnr container.Container) {
 	p.cnr = cnr
 }
 
@@ -41,22 +39,7 @@ func (p *PutPrm) SetToken(token []byte) {
 	p.token = token
 }
 
-// SetName sets native name.
-func (p *PutPrm) SetName(name string) {
-	p.name = name
-}
-
-// SetZone sets zone.
-func (p *PutPrm) SetZone(zone string) {
-	p.zone = zone
-}
-
-// EnableMeta enables meta-on-chain.
-func (p *PutPrm) EnableMeta() {
-	p.enableMetaOnChain = true
-}
-
-// Put saves binary container with its session token, key and signature
+// Put saves container with its session token, key and signature
 // in NeoFS system through Container contract call.
 //
 // Returns calculated container identifier and any error
@@ -69,7 +52,12 @@ func (c *Client) Put(p PutPrm) (cid.ID, error) {
 	var prm client.InvokePrm
 	prm.SetMethod(fschaincontracts.CreateContainerMethod)
 	prm.InvokePrmOptional = p.InvokePrmOptional
-	prm.SetArgs(p.cnr, p.sig, p.key, p.token, p.name, p.zone, p.enableMetaOnChain)
+
+	domain := p.cnr.ReadDomain()
+	metaAttr := p.cnr.Attribute("__NEOFS__METAINFO_CONSISTENCY")
+	metaEnabled := metaAttr == "optimistic" || metaAttr == "strict"
+	cnrBytes := p.cnr.Marshal()
+	prm.SetArgs(cnrBytes, p.sig, p.key, p.token, domain.Name(), domain.Zone(), metaEnabled)
 
 	// no magic bugs with notary requests anymore, this operation should
 	// _always_ be notary signed so make it one more time even if it is
@@ -83,9 +71,9 @@ func (c *Client) Put(p PutPrm) (cid.ID, error) {
 			if err = c.client.Invoke(prm); err != nil {
 				return cid.ID{}, fmt.Errorf("could not invoke method (%s): %w", putMethod, err)
 			}
-			return cid.NewFromMarshalledContainer(p.cnr), nil
+			return cid.NewFromMarshalledContainer(cnrBytes), nil
 		}
 		return cid.ID{}, fmt.Errorf("could not invoke method (%s): %w", fschaincontracts.CreateContainerMethod, err)
 	}
-	return cid.NewFromMarshalledContainer(p.cnr), nil
+	return cid.NewFromMarshalledContainer(cnrBytes), nil
 }