From 5d2e7ce5fed723db48df071e16f2c059776285ee Mon Sep 17 00:00:00 2001 From: Mikhail Rakhmanov Date: Fri, 11 Apr 2025 21:17:28 +0200 Subject: [PATCH] Fix check --- commonspace/object/keyvalue/keyvalue_test.go | 23 +++++++++++-------- .../keyvalue/keyvaluestorage/storage.go | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/commonspace/object/keyvalue/keyvalue_test.go b/commonspace/object/keyvalue/keyvalue_test.go index 7cf81e4c..9ff1c59a 100644 --- a/commonspace/object/keyvalue/keyvalue_test.go +++ b/commonspace/object/keyvalue/keyvalue_test.go @@ -197,17 +197,20 @@ func (fx *fixture) add(t *testing.T, key string, value []byte) { require.NoError(t, err) } -func (fx *fixture) check(t *testing.T, key string, value []byte) bool { - kv, decryptor, err := fx.defaultStore.GetAll(ctx, key) - require.NoError(t, err) - for _, v := range kv { - decryptedValue, err := decryptor(v) - require.NoError(t, err) - if bytes.Equal(value, decryptedValue) { - return true +func (fx *fixture) check(t *testing.T, key string, value []byte) (isFound bool) { + err := fx.defaultStore.GetAll(ctx, key, func(decryptor keyvaluestorage.Decryptor, values []innerstorage.KeyValue) error { + for _, v := range values { + decryptedValue, err := decryptor(v) + require.NoError(t, err) + if bytes.Equal(value, decryptedValue) { + isFound = true + break + } } - } - return false + return nil + }) + require.NoError(t, err) + return } func newStorageCreatePayload(t *testing.T, keys *accountdata.AccountKeys) spacestorage.SpaceStorageCreatePayload { diff --git a/commonspace/object/keyvalue/keyvaluestorage/storage.go b/commonspace/object/keyvalue/keyvaluestorage/storage.go index ff2b2f54..ebf62f35 100644 --- a/commonspace/object/keyvalue/keyvaluestorage/storage.go +++ b/commonspace/object/keyvalue/keyvaluestorage/storage.go @@ -53,7 +53,7 @@ type Storage interface { Prepare() error Set(ctx context.Context, key string, value []byte) error SetRaw(ctx context.Context, keyValue ...*spacesyncproto.StoreKeyValue) error - GetAll(ctx context.Context, key string, get func(decryptor Decryptor, values []innerstorage.KeyValue) error) + GetAll(ctx context.Context, key string, get func(decryptor Decryptor, values []innerstorage.KeyValue) error) error Iterate(ctx context.Context, f func(key string, values []innerstorage.KeyValue) (bool, error)) error InnerStorage() innerstorage.KeyValueStorage }