realloc/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#297] Update neofs-sdk-go and neo-go

Browse source 
Signed-off-by: Denis Kirillov <denis@nspcc.ru>
This commit is contained in:
Denis Kirillov 2021-12-29 16:38:23 +03:00 • committed by Angira Kekteeva
parent a23a97efd6
commit 12c15504ef
9 changed files with 61 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/layer/container.go
View file

@ -166,11 +166,7 @@ func (n *layer) setContainerEACLTable(ctx context.Context, cid *cid.ID, table *e
}
func (n *layer) GetContainerEACL(ctx context.Context, cid *cid.ID) (*eacl.Table, error) {
signedEacl, err := n.pool.GetEACL(ctx, cid)
if err != nil {
return nil, err
}
return signedEacl.EACL(), nil
return n.pool.GetEACL(ctx, cid)
}
type waitParams struct {
@ -204,9 +200,9 @@ func (n *layer) waitEACLPresence(ctx context.Context, cid *cid.ID, table *eacl.T
case <-wdone:
return wctx.Err()
case <-ticker.C:
signedEacl, err := n.pool.GetEACL(ctx, cid)
eaclTable, err := n.pool.GetEACL(ctx, cid)
if err == nil {
got, err := signedEacl.EACL().Marshal()
got, err := eaclTable.Marshal()
if err == nil && bytes.Equal(exp, got) {
return nil
}