From 557f88bcc5df5afec61080318f95e516f54eb97a Mon Sep 17 00:00:00 2001 From: Vasily Gerasimov Date: Sat, 18 Jan 2025 00:08:41 +0100 Subject: [PATCH] Fix build --- .../nodewarden/blobstorage_node_warden_ut.cpp | 16 ++++++++-------- .../ut_fat/blobstorage_node_warden_ut_fat.cpp | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ydb/core/blobstorage/nodewarden/blobstorage_node_warden_ut.cpp b/ydb/core/blobstorage/nodewarden/blobstorage_node_warden_ut.cpp index d607d2dd73b5..130a1cf3d666 100644 --- a/ydb/core/blobstorage/nodewarden/blobstorage_node_warden_ut.cpp +++ b/ydb/core/blobstorage/nodewarden/blobstorage_node_warden_ut.cpp @@ -192,8 +192,8 @@ void SetupServices(TTestActorRuntime &runtime, TString extraPath, TIntrusivePtr< if (nodeIndex == 0) { nodeWardenConfig->SectorMaps[extraPath] = extraSectorMap; - ObtainTenantKey(&nodeWardenConfig->TenantKey, app.Keys[0]); - ObtainStaticKey(&nodeWardenConfig->StaticKey); + ObtainTenantKeys(&nodeWardenConfig->TenantKeys, app.Keys[0]); + ObtainStaticKeys(&nodeWardenConfig->StaticKeys); TString baseDir = runtime.GetTempDir(); @@ -852,17 +852,17 @@ Y_UNIT_TEST_SUITE(TBlobStorageWardenTest) { keyRecord->SetId("Key"); keyRecord->SetVersion(1); - TEncryptionKey key1; - UNIT_ASSERT(ObtainTenantKey(&key1, keyConfig)); + TEncryptionKeys key1; + UNIT_ASSERT(ObtainTenantKeys(&key1, keyConfig)); keyRecord->SetPin(pin2); - TEncryptionKey key2; - UNIT_ASSERT(ObtainTenantKey(&key2, keyConfig)); + TEncryptionKeys key2; + UNIT_ASSERT(ObtainTenantKeys(&key2, keyConfig)); if (pin1 == pin2) { - UNIT_ASSERT(key1.Key == key2.Key); + UNIT_ASSERT(key1.GetCurrentEncryptionKey().Key == key2.GetCurrentEncryptionKey().Key); } else { - UNIT_ASSERT(!(key1.Key == key2.Key)); + UNIT_ASSERT(!(key1.GetCurrentEncryptionKey().Key == key2.GetCurrentEncryptionKey().Key)); } } diff --git a/ydb/core/mind/ut_fat/blobstorage_node_warden_ut_fat.cpp b/ydb/core/mind/ut_fat/blobstorage_node_warden_ut_fat.cpp index 142f9be0b63a..9d7b9a684705 100644 --- a/ydb/core/mind/ut_fat/blobstorage_node_warden_ut_fat.cpp +++ b/ydb/core/mind/ut_fat/blobstorage_node_warden_ut_fat.cpp @@ -194,8 +194,8 @@ void SetupServices(TTestActorRuntime &runtime) { google::protobuf::TextFormat::ParseFromString(staticConfig, nodeWardenConfig->BlobStorageConfig.MutableServiceSet()); app.SetKeyForNode(keyfile, nodeIndex); - ObtainTenantKey(&nodeWardenConfig->TenantKey, app.Keys[nodeIndex]); - ObtainStaticKey(&nodeWardenConfig->StaticKey); + ObtainTenantKeys(&nodeWardenConfig->TenantKeys, app.Keys[nodeIndex]); + ObtainStaticKeys(&nodeWardenConfig->StaticKeys); if (nodeIndex == 0) { static TTempDir tempDir;