optional

Signed-off-by: turuslan <[email protected]>

core/api/service/impl/api_service_impl.cpp

@@ -515,7 +515,7 @@ namespace kagome::api {
   void ApiServiceImpl::onStorageEvent(SubscriptionSetId set_id,
                                       SessionPtr &session,
                                       const Buffer &key,
-                                      const Buffer &data,
+                                      const std::optional<Buffer> &data,
                                       const common::Hash256 &block) {
     sendEvent(server_,
               session,

core/api/service/impl/api_service_impl.hpp

@@ -197,7 +197,7 @@ namespace kagome::api {
     void onStorageEvent(SubscriptionSetId set_id,
                         SessionPtr &session,
                         const Buffer &key,
-                        const Buffer &data,
+                        const std::optional<Buffer> &data,
                         const common::Hash256 &block);
     void onChainEvent(SubscriptionSetId set_id,
                       SessionPtr &session,

core/primitives/event_types.hpp

@@ -216,7 +216,7 @@ namespace kagome::primitives::events {
   using StorageSubscriptionEngine =
       subscription::SubscriptionEngine<common::Buffer,
                                        std::shared_ptr<api::Session>,
-                                       common::Buffer,
+                                       std::optional<common::Buffer>,
                                        primitives::BlockHash>;
   using StorageSubscriptionEnginePtr =
       std::shared_ptr<StorageSubscriptionEngine>;

core/storage/changes_trie/impl/storage_changes_tracker_impl.cpp

@@ -55,10 +55,11 @@ namespace kagome::storage::changes_trie {
           primitives::events::ChainEventType::kNewRuntime, hash);
     }
     for (auto &pair : actual_val_) {
-      SL_TRACE(logger_,
-               "Key: 0x{}; Value 0x{};",
-               pair.first.toHex(),
-               pair.second.toHex());
+      if (pair.second) {
+        SL_TRACE(logger_, "Key: {:l}; Value {:l};", pair.first, *pair.second);
+      } else {
+        SL_TRACE(logger_, "Key: {:l}; Removed;", pair.first);
+      }
       storage_subscription_engine_->notify(
           pair.first, pair.second, parent_hash_);
     }
@@ -71,7 +72,7 @@ namespace kagome::storage::changes_trie {
          && prefix.size() <= static_cast<ssize_t>(it->first.size())
          && it->first.view(0, prefix.size()) == prefix;
          ++it) {
-      it->second.clear();
+      it->second.reset();
     }
   }
 
@@ -101,7 +102,7 @@ namespace kagome::storage::changes_trie {
   outcome::result<void> StorageChangesTrackerImpl::onRemove(
       common::BufferView extrinsic_index, const common::BufferView &key) {
     if (auto it = actual_val_.find(key); it != actual_val_.end()) {
-      it->second.clear();
+      it->second.reset();
     }
 
     auto change_it = extrinsics_changes_.find(key);

core/storage/changes_trie/impl/storage_changes_tracker_impl.hpp

@@ -59,7 +59,8 @@ namespace kagome::storage::changes_trie {
     std::set<common::Buffer, std::less<>>
         new_entries_;  // entries that do not yet exist in
                        // the underlying storage
-    std::map<common::Buffer, common::Buffer, std::less<>> actual_val_;
+    std::map<common::Buffer, std::optional<common::Buffer>, std::less<>>
+        actual_val_;
 
     primitives::BlockHash parent_hash_;
     primitives::BlockNumber parent_number_;