ironbee/frostfs-sdk-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-sdk-go
Code Pull requests Activity

[#242] object: Require only 1 field to be set for SplitInfo

Browse source 
Also write more tests.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-05-17 17:18:49 +03:00 • committed by LeL
parent 12ea1e8d74
commit c976332e20
2 changed files with 75 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

35
object/splitinfo.go
View file

@ -110,30 +110,29 @@ func (s *SplitInfo) UnmarshalJSON(data []byte) error {
return formatCheckSI((*object.SplitInfo)(s))
}
var errLinkNotSet = errors.New("link object ID is not set")
var errLastPartNotSet = errors.New("last part object ID is not set")
var errSplitInfoMissingFields = errors.New("neither link object ID nor last part object ID is set")
func formatCheckSI(v2 *object.SplitInfo) error {
link := v2.GetLink()
lastPart := v2.GetLastPart()
if link == nil && lastPart == nil {
return errSplitInfoMissingFields
}
var oID oid.ID
link := v2.GetLink()
if link == nil {
return errLinkNotSet
if link != nil {
err := oID.ReadFromV2(*link)
if err != nil {
return fmt.Errorf("could not convert link object ID: %w", err)
}
}
err := oID.ReadFromV2(*link)
if err != nil {
return fmt.Errorf("could not convert link object ID: %w", err)
}
lastPart := v2.GetLastPart()
if lastPart == nil {
return errLastPartNotSet
}
err = oID.ReadFromV2(*lastPart)
if err != nil {
return fmt.Errorf("could not convert last part object ID: %w", err)
if lastPart != nil {
err := oID.ReadFromV2(*lastPart)
if err != nil {
return fmt.Errorf("could not convert last part object ID: %w", err)
}
}
return nil