Statistics: TWaitForFirstEvent (#8646)

1 files changed, 5 insertions, 5 deletions

diff --git a/ydb/core/statistics/ut_common/ut_common.cpp b/ydb/core/statistics/ut_common/ut_common.cpp
index 72d1b726d2..b00c70c4bd 100644
--- a/ydb/core/statistics/ut_common/ut_common.cpp
+++ b/ydb/core/statistics/ut_common/ut_common.cpp
@@ -6,6 +6,8 @@
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
 
+#include <ydb/core/testlib/actors/wait_events.h>
+
 // TODO remove SDK
 #include <ydb/public/sdk/cpp/client/ydb_result/result.h>
 #include <ydb/public/sdk/cpp/client/ydb_table/table.h>
@@ -436,13 +438,11 @@ void AnalyzeStatus(TTestActorRuntime& runtime, TActorId sender, ui64 saTabletId,
 }
 
 void WaitForSavedStatistics(TTestActorRuntime& runtime, const TPathId& pathId) {
-    bool eventSeen = false;
-    auto observer = runtime.AddObserver<TEvStatistics::TEvSaveStatisticsQueryResponse>([&](auto& ev){
-        if (ev->Get()->PathId == pathId)
-            eventSeen = true;
+    TWaitForFirstEvent<TEvStatistics::TEvSaveStatisticsQueryResponse> waiter(runtime, [pathId](const auto& ev){
+        return ev->Get()->PathId == pathId;
     });
 
-    runtime.WaitFor("TEvSaveStatisticsQueryResponse", [&]{ return eventSeen; });
+    waiter.Wait();
 }