TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 101 Pull requests 5 Projects Releases 1 Activity Actions

[#xx] Use Address.Equals in policer tests #519

Merged
fyrchik merged 1 commit from ale64bit/frostfs-node:fix/addr-equals into master 2023-07-17 10:45:08 +00:00
Conversation 4 Commits 1 Files changed 1 +2 -7
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9d70ab2488 - Show all commits

9
pkg/services/policer/policer_test.go
View file

@ -220,11 +220,11 @@ func TestProcessObject(t *testing.T) {
WithRemoteObjectHeaderFunc(headFn), WithRemoteObjectHeaderFunc(headFn),
WithBuryFunc(buryFn), WithBuryFunc(buryFn),
WithRedundantCopyCallback(func(_ context.Context, a oid.Address) { WithRedundantCopyCallback(func(_ context.Context, a oid.Address) {
require.True(t, eqAddr(a, addr), "unexpected redundant copy callback: a=%v", a) require.True(t, a.Equals(addr), "unexpected redundant copy callback: a=%v", a)
gotRemoveRedundant = true gotRemoveRedundant = true
}), }),
WithReplicator(replicatorFunc(func(_ context.Context, task replicator.Task, res replicator.TaskResult) { WithReplicator(replicatorFunc(func(_ context.Context, task replicator.Task, res replicator.TaskResult) {
require.True(t, eqAddr(task.Addr, addr), "unexpected replicator task: %+v", task) require.True(t, task.Addr.Equals(addr), "unexpected replicator task: %+v", task)
for _, node := range task.Nodes { for _, node := range task.Nodes {
gotReplicateTo = append(gotReplicateTo, int(node.PublicKey()[0])) gotReplicateTo = append(gotReplicateTo, int(node.PublicKey()[0]))
} }
@ -303,11 +303,6 @@ func TestIteratorContract(t *testing.T) {
}, it.calls) }, it.calls)
} }
// TODO(https://git.frostfs.info/TrueCloudLab/frostfs-sdk-go/issues/101)
func eqAddr(a, b oid.Address) bool {
return a.Container().Equals(b.Container()) && a.Object().Equals(b.Object())
}
type nextResult struct { type nextResult struct {
objs []objectcore.AddressWithType objs []objectcore.AddressWithType
err error err error