Skip to content

Object PUT unit testing #3461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cthulhu-rider merged 5 commits into from
Jul 15, 2025
Merged

Object PUT unit testing #3461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1793dbc
sn/object: Drop unused parameter of PUT server
cthulhu-rider Jul 10, 2025
9cd9e56
internal/crypto: Fix proto version in test bearer token structure
cthulhu-rider Jul 15, 2025
bcb7d66
metabase: avoid using storage group type in tests
cthulhu-rider Jul 15, 2025
0e019f8
go.mod: Upgrade `github.com/nspcc-dev/neofs-sdk-go` to the latest
cthulhu-rider Jul 15, 2025
5352c5a
sn/object: Test data slicing and chunk placement in PUT server
cthulhu-rider Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Changelog for NeoFS Node
- Metadata's signatures for extremely big objects and/or short epochs (#3391)
- No object addresses in object inhuming/deleting error logs (#3450)
- Flush test timing issue with object counters update (#3455)
- Incorrect binary for LINK object put into local storage (#3461)

### Changed
- SN caches up to 1000 bearer token verification results until the next epoch (#3369)
Expand All @@ -43,7 +44,7 @@ Changelog for NeoFS Node
- Support for Inner Ring candidate fee setting (#3459)

### Updated
- `github.com/nspcc-dev/neofs-sdk-go` dependency to `v1.0.0-rc.13.0.20250623124459-a9cfab652dc0` (#3406)
- `github.com/nspcc-dev/neofs-sdk-go` dependency to `v1.0.0-rc.13.0.20250715070617-c7038b450691` (#3406, #3461)
- NeoGo dependency to v0.110.1-0.20250709130255-4f05526f09f6 (#3456)

### Updating from v0.47.1
Expand Down
1 change: 0 additions & 1 deletion cmd/neofs-node/object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@ func initObjectService(c *cfg) {
putsvc.WithMaxSizeSource(newCachedMaxObjectSizeSource(c)),
putsvc.WithObjectStorage(storageEngine{engine: ls}),
putsvc.WithContainerSource(c.cnrSrc),
putsvc.WithNetworkMapSource(c.netMapSource),
putsvc.WithNetworkState(c.cfgNetmap.state),
putsvc.WithRemoteWorkerPool(c.cfgObject.pool.putRemote),
putsvc.WithLogger(c.log),
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/nspcc-dev/neo-go v0.110.1-0.20250709130255-4f05526f09f6
github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea
github.com/nspcc-dev/neofs-contract v0.23.0
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250627083806-673e1845df8f
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250715070617-c7038b450691
github.com/nspcc-dev/tzhash v1.8.2
github.com/olekukonko/tablewriter v0.0.5
github.com/panjf2000/ants/v2 v2.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea h1:mK
github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea/go.mod h1:YzhD4EZmC9Z/PNyd7ysC7WXgIgURc9uCG1UWDeV027Y=
github.com/nspcc-dev/neofs-contract v0.23.0 h1:F5ciU0wPqSbycPY8qOtb4PvgnSZBNQ5Jp9tdeVSKu4o=
github.com/nspcc-dev/neofs-contract v0.23.0/go.mod h1:it6Su92UvEFQDsMOfDIXapLu0j5TQSOvkS2YdUlPdgo=
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250627083806-673e1845df8f h1:jDqFzFwhB4sfGncaXq/NAU44UePi8DKnw4Es1OsnYMI=
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250627083806-673e1845df8f/go.mod h1:j/NUu5iOGFkOVYM42XoC1X9DZD0/y89Pws++w5vxtQk=
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250715070617-c7038b450691 h1:h3H+LymyO8J1gGsTLln6ID8AOVJ9IggJ5FTYNUjGPTA=
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250715070617-c7038b450691/go.mod h1:j/NUu5iOGFkOVYM42XoC1X9DZD0/y89Pws++w5vxtQk=
github.com/nspcc-dev/rfc6979 v0.2.3 h1:QNVykGZ3XjFwM/88rGfV3oj4rKNBy+nYI6jM7q19hDI=
github.com/nspcc-dev/rfc6979 v0.2.3/go.mod h1:q3sCL1Ed7homjqYK8KmFSzEmm+7Ngyo7PePbZanhaDE=
github.com/nspcc-dev/tzhash v1.8.2 h1:ebRCbPoEuoqrhC6sSZmrT/jI3h1SzCWakxxV6gp5QAg=
Expand Down
6 changes: 5 additions & 1 deletion internal/crypto/tokens_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
"github.com/nspcc-dev/neofs-sdk-go/session"
"github.com/nspcc-dev/neofs-sdk-go/user"
"github.com/nspcc-dev/neofs-sdk-go/version"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -389,8 +390,11 @@ func getUnsignedNoIssuerBearerToken() bearer.Token {
),
}

eACL := eacl.NewTableForContainer(cnr, rs)
eACL.SetVersion(version.New(2, 16))

var token bearer.Token
token.SetEACLTable(eacl.NewTableForContainer(cnr, rs))
token.SetEACLTable(eACL)
token.SetIat(943083305)
token.SetNbf(1362292619)
token.SetExp(1922557325)
Expand Down
14 changes: 7 additions & 7 deletions pkg/local_object_storage/metabase/version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,39 +818,39 @@ func TestMigrate3to4(t *testing.T) {
{name: "empty containers only", m: map[object.Type][]uint{
object.TypeRegular: make([]uint, 3),
object.TypeTombstone: make([]uint, 5),
object.TypeStorageGroup: make([]uint, 10),
object.TypeStorageGroup: make([]uint, 10), //nolint:staticcheck // storage groups are deprecated, but this is a migration test.
object.TypeLock: make([]uint, 1),
object.TypeLink: make([]uint, 100),
}},
{name: "some containers are empty", m: map[object.Type][]uint{
object.TypeRegular: {1, 7, 0, 20},
object.TypeTombstone: {0, 15, 0},
object.TypeStorageGroup: make([]uint, 10),
object.TypeStorageGroup: make([]uint, 10), //nolint:staticcheck // storage groups are deprecated, but this is a migration test.
}},
{name: "some containers are empty", m: map[object.Type][]uint{
object.TypeRegular: {1, 7, 0, 20},
object.TypeTombstone: {0, 15, 0},
object.TypeStorageGroup: make([]uint, 10),
object.TypeStorageGroup: make([]uint, 10), //nolint:staticcheck // storage groups are deprecated, but this is a migration test.
}},
{name: "one big container", m: map[object.Type][]uint{
object.TypeRegular: {3999},
}},
{name: "big counts", m: map[object.Type][]uint{
object.TypeRegular: {200, 700, 600},
object.TypeTombstone: {20, 30},
object.TypeStorageGroup: {10, 0, 20, 0, 30, 0, 40, 0},
object.TypeStorageGroup: {10, 0, 20, 0, 30, 0, 40, 0}, //nolint:staticcheck // storage groups are deprecated, but this is a migration test.
object.TypeLock: {1, 2, 3, 4, 5, 6, 7, 8, 9},
object.TypeLink: {99},
}},
{name: "big counts aligned", m: map[object.Type][]uint{
object.TypeRegular: {1000},
object.TypeTombstone: {500, 500, 500},
object.TypeStorageGroup: {200, 200, 200, 200, 200},
object.TypeStorageGroup: {200, 200, 200, 200, 200}, //nolint:staticcheck // storage groups are deprecated, but this is a migration test.
}},
{name: "big counts not aligned", m: map[object.Type][]uint{
object.TypeRegular: {999, 999},
object.TypeTombstone: {999},
object.TypeStorageGroup: {999, 999, 999},
object.TypeStorageGroup: {999, 999, 999}, //nolint:staticcheck // storage groups are deprecated, but this is a migration test.
}},
} {
t.Run(tc.name, func(t *testing.T) { testMigrationV3To4(t, tc.m) })
Expand Down Expand Up @@ -895,7 +895,7 @@ func testMigrationV3To4(t *testing.T, mAll map[object.Type][]uint) {
prefix = 0x06
case object.TypeTombstone:
prefix = 0x09
case object.TypeStorageGroup:
case object.TypeStorageGroup: //nolint:staticcheck // storage groups are deprecated, but this is a migration test.
prefix = 0x08
case object.TypeLock:
prefix = 0x07
Expand Down
15 changes: 6 additions & 9 deletions pkg/services/object/put/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@

cnrSrc container.Source

netMapSrc netmap.Source

remotePool util.WorkerPool

fmtValidator *object.FormatValidator
Expand Down Expand Up @@ -125,7 +123,12 @@
opts[i](c)
}

c.fmtValidator = object.NewFormatValidator(c.cnrClient.Morph(), neoFSNet, c.fmtValidatorOpts...)
var fmtValidatorChain object.FSChain
if c.cnrClient != nil {
fmtValidatorChain = c.cnrClient.Morph()
}

Check warning on line 129 in pkg/services/object/put/service.go

View check run for this annotation

Codecov / codecov/patch

pkg/services/object/put/service.go#L128-L129 

Added lines #L128 - L129 were not covered by tests

c.fmtValidator = object.NewFormatValidator(fmtValidatorChain, neoFSNet, c.fmtValidatorOpts...)
c.metaSvc = m

return &Service{
Expand Down Expand Up @@ -169,12 +172,6 @@
}
}

func WithNetworkMapSource(v netmap.Source) Option {
return func(c *cfg) {
c.netMapSrc = v
}
}

func WithRemoteWorkerPool(remote util.WorkerPool) Option {
return func(c *cfg) {
c.remotePool = remote
Expand Down
Loading
Loading