object: Improve testing and increase coverage for Object type (#634)

client/container_statistic_test.go

@@ -580,7 +580,7 @@ func TestClientStatistic_ObjectPut(t *testing.T) {
 	prm.WithinSession(tokenSession)
 
 	var hdr object.Object
-	hdr.SetOwnerID(&usr.ID)
+	hdr.SetOwner(usr.ID)
 	hdr.SetContainerID(containerID)
 
 	writer, err := c.ObjectPutInit(ctx, hdr, usr, prm)

client/object_get.go

@@ -124,9 +124,8 @@ func (x *PayloadReader) readHeader(dst *object.Object) bool {
 
 	x.remainingPayloadLen = int(objv2.GetHeader().GetPayloadLength())
 
-	*dst = *object.NewFromV2(&objv2) // need smth better
-
-	return true
+	x.err = dst.ReadFromV2(objv2)
+	return x.err == nil
 }
 
 func (x *PayloadReader) readChunk(buf []byte) (int, bool) {
@@ -404,10 +403,11 @@ func (c *Client) ObjectHead(ctx context.Context, containerID cid.ID, objectID oi
 		objv2.SetHeader(v.GetHeader())
 		objv2.SetSignature(v.GetSignature())
 
-		obj := object.NewFromV2(&objv2)
-		obj.SetID(objectID)
-
-		return obj, nil
+		var obj object.Object
+		if err = obj.ReadFromV2(objv2); err != nil {
+			return nil, fmt.Errorf("invalid header response: %w", err)
+		}
+		return &obj, nil
 	}
 }
 

object/fmt.go

@@ -38,7 +38,7 @@ func (o *Object) CalculateAndSetPayloadChecksum() {
 
 // VerifyPayloadChecksum checks if payload checksum in the object
 // corresponds to its payload.
-func (o *Object) VerifyPayloadChecksum() error {
+func (o Object) VerifyPayloadChecksum() error {
 	actual := CalculatePayloadChecksum(o.Payload())
 
 	cs, set := o.PayloadChecksum()
@@ -54,7 +54,7 @@ func (o *Object) VerifyPayloadChecksum() error {
 }
 
 // CalculateID calculates identifier for the object.
-func (o *Object) CalculateID() (oid.ID, error) {
+func (o Object) CalculateID() (oid.ID, error) {
 	return sha256.Sum256(o.ToV2().GetHeader().StableMarshal(nil)), nil
 }
 
@@ -73,7 +73,7 @@ func (o *Object) CalculateAndSetID() error {
 
 // VerifyID checks if identifier in the object corresponds to
 // its structure.
-func (o *Object) VerifyID() error {
+func (o Object) VerifyID() error {
 	id, err := o.CalculateID()
 	if err != nil {
 		return err
@@ -113,13 +113,13 @@ func (o *Object) Sign(signer neofscrypto.Signer) error {
 // SignedData returns actual payload to sign.
 //
 // See also [Object.Sign].
-func (o *Object) SignedData() []byte {
+func (o Object) SignedData() []byte {
 	return o.GetID().Marshal()
 }
 
 // VerifySignature verifies object ID signature.
-func (o *Object) VerifySignature() bool {
-	m := (*object.Object)(o)
+func (o Object) VerifySignature() bool {
+	m := (*object.Object)(&o)
 
 	sigV2 := m.GetSignature()
 	if sigV2 == nil {
@@ -157,7 +157,7 @@ func (o *Object) SetVerificationFields(signer neofscrypto.Signer) error {
 }
 
 // CheckVerificationFields checks all verification fields of the object.
-func (o *Object) CheckVerificationFields() error {
+func (o Object) CheckVerificationFields() error {
 	if err := o.CheckHeaderVerificationFields(); err != nil {
 		return fmt.Errorf("invalid header structure: %w", err)
 	}
@@ -172,7 +172,7 @@ func (o *Object) CheckVerificationFields() error {
 var errInvalidSignature = errors.New("invalid signature")
 
 // CheckHeaderVerificationFields checks all verification fields except payload.
-func (o *Object) CheckHeaderVerificationFields() error {
+func (o Object) CheckHeaderVerificationFields() error {
 	if !o.VerifySignature() {
 		return errInvalidSignature
 	}