[#194] pkg/container: Implement container constructor with format check

Implement NewVerifiedFromV2 function that verifies format of NeoFS API V2
Container message.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-12-24 12:28:33 +03:00 committed by Leonard Lyubich
parent 70c29ca3e5
commit 7988405753
3 changed files with 80 additions and 0 deletions

View file

@ -42,6 +42,10 @@ func (c *Container) ToV2() *container.Container {
return &c.v2
}
// NewVerifiedFromV2 constructs Container from NeoFS API V2 Container message.
//
// Does not perform if message meets NeoFS API V2 specification. To do this
// use NewVerifiedFromV2 constructor.
func NewContainerFromV2(c *container.Container) *Container {
cnr := new(Container)

27
pkg/container/fmt.go Normal file
View file

@ -0,0 +1,27 @@
package container
import (
"github.com/nspcc-dev/neofs-api-go/pkg"
"github.com/nspcc-dev/neofs-api-go/v2/container"
"github.com/pkg/errors"
)
// NewVerifiedFromV2 constructs Container from NeoFS API V2 Container message.
// Returns error if message does not meet NeoFS API V2 specification.
//
// Additionally checks if message carries supported version.
func NewVerifiedFromV2(cnrV2 *container.Container) (*Container, error) {
cnr := NewContainerFromV2(cnrV2)
// check version support
if err := pkg.IsSupportedVersion(cnr.Version()); err != nil {
return nil, err
}
// check nonce format
if _, err := cnr.NonceUUID(); err != nil {
return nil, errors.Wrap(err, "invalid nonce")
}
return cnr, nil
}

49
pkg/container/fmt_test.go Normal file
View file

@ -0,0 +1,49 @@
package container_test
import (
"testing"
"github.com/google/uuid"
"github.com/nspcc-dev/neofs-api-go/pkg"
"github.com/nspcc-dev/neofs-api-go/pkg/container"
containerV2 "github.com/nspcc-dev/neofs-api-go/v2/container"
"github.com/stretchr/testify/require"
)
func TestNewVerifiedFromV2(t *testing.T) {
cnrV2 := new(containerV2.Container)
errAssert := func() {
_, err := container.NewVerifiedFromV2(cnrV2)
require.Error(t, err)
}
// set unsupported version
v := pkg.SDKVersion()
v.SetMajor(0)
require.Error(t, pkg.IsSupportedVersion(v))
cnrV2.SetVersion(v.ToV2())
errAssert()
// set supported version
v.SetMajor(2)
require.NoError(t, pkg.IsSupportedVersion(v))
cnrV2.SetVersion(v.ToV2())
errAssert()
// set invalid nonce
nonce := []byte{1, 2, 3}
cnrV2.SetNonce(nonce)
errAssert()
// set valid nonce
uid := uuid.New()
data, _ := uid.MarshalBinary()
cnrV2.SetNonce(data)
_, err := container.NewVerifiedFromV2(cnrV2)
require.NoError(t, err)
}