Fix review issues

Author: kuznetsss

src/etl/ETLService.cpp

@@ -380,18 +380,16 @@ ETLService::startMonitor(uint32_t seq)
         auto const backendRange = backend_->fetchLedgerRange();
         auto const backendNeedsUpdate = backendRange.has_value() and backendRange->maxSequence < seq;
 
-        if (cacheNeedsUpdate or backendNeedsUpdate) {
+        if (cacheNeedsUpdate) {
             auto const diff = data::synchronousAndRetryOnTimeout([this, seq](auto yield) {
                 return backend_->fetchLedgerDiff(seq, yield);
             });
-
-            if (cacheNeedsUpdate)
-                cacheUpdater_->update(seq, diff);
-
-            if (backendNeedsUpdate)
-                backend_->updateRange(seq);
+            cacheUpdater_->update(seq, diff);
         }
 
+        if (backendNeedsUpdate)
+            backend_->updateRange(seq);
+
         publisher_->publish(seq, {});
     });
 

src/util/Channel.hpp

@@ -151,13 +151,15 @@ class Channel {
          * @brief Constructs a Sender from a shared control block.
          * @param shared The shared control block managing the channel state
          */
-        Sender(std::shared_ptr<ControlBlock> shared) : shared_(shared)
+        Sender(std::shared_ptr<ControlBlock> shared)
+            : shared_(shared), guard_([shared = std::move(shared)]() {
+                if constexpr (kIS_MULTI_PRODUCER) {
+                    return std::make_shared<Guard>(std::move(shared));
+                } else {
+                    return Guard{std::move(shared)};
+                }
+            }())
         {
-            if constexpr (kIS_MULTI_PRODUCER) {
-                guard_ = std::make_shared<Guard>(shared);
-            } else {
-                guard_ = Guard{std::move(shared)};
-            }
         }
 
     public:
@@ -269,13 +271,15 @@ class Channel {
          * @brief Constructs a Receiver from a shared control block.
          * @param shared The shared control block managing the channel state
          */
-        Receiver(std::shared_ptr<ControlBlock> shared) : shared_(shared)
+        Receiver(std::shared_ptr<ControlBlock> shared)
+            : shared_(shared), guard_([shared = std::move(shared)]() {
+                if constexpr (kIS_MULTI_CONSUMER) {
+                    return std::make_shared<Guard>(std::move(shared));
+                } else {
+                    return Guard{std::move(shared)};
+                }
+            }())
         {
-            if constexpr (kIS_MULTI_CONSUMER) {
-                guard_ = std::make_shared<Guard>(shared);
-            } else {
-                guard_ = Guard{std::move(shared)};
-            }
         }
 
     public:

tests/unit/etl/ETLServiceTests.cpp

@@ -757,8 +757,7 @@ TEST_F(ETLServiceTests, StopWaitsForWriteCommandHandlersToComplete)
     // Stop should wait for the handler to complete and disconnect the subscription
     service_.stop();
 
-    // Verify stop() returned, meaning all handlers completed
-    SUCCEED();
+    // The test will hang on stop() or in service_ destructor if there is a problem.
 }
 
 TEST_F(ETLServiceTests, WriteConflictIsHandledImmediately_NotDelayed)