Merge branch 'project-pineapples' of github.com:memgraph/memgraph into T0941-MG-implement-basic-raft-version

src/io/simulator/message_conversion.hpp

@@ -118,9 +118,14 @@ class OpaquePromise {
   std::unique_ptr<OpaquePromiseTraitBase> trait_;
 
  public:
-  OpaquePromise(OpaquePromise &&old) noexcept : ptr_(old.ptr_), trait_(std::move(old.trait_)) { old.ptr_ = nullptr; }
+  OpaquePromise(OpaquePromise &&old) noexcept : ptr_(old.ptr_), trait_(std::move(old.trait_)) {
+    MG_ASSERT(old.ptr_ != nullptr);
+    old.ptr_ = nullptr;
+  }
 
   OpaquePromise &operator=(OpaquePromise &&old) noexcept {
+    MG_ASSERT(ptr_ == nullptr);
+    MG_ASSERT(old.ptr_ != nullptr);
     MG_ASSERT(this != &old);
     ptr_ = old.ptr_;
     trait_ = std::move(old.trait_);

src/io/simulator/simulator_handle.cpp

@@ -54,10 +54,8 @@ size_t SimulatorHandle::BlockedServers() {
   size_t blocked_servers = blocked_on_receive_;
 
   for (auto &[promise_key, opaque_promise] : promises_) {
-    if (opaque_promise.promise.IsAwaited()) {
-      if (server_addresses_.contains(promise_key.requester_address)) {
-        blocked_servers++;
-      }
+    if (opaque_promise.promise.IsAwaited() && server_addresses_.contains(promise_key.requester_address)) {
+      blocked_servers++;
     }
   }