From e5bfb26b5366b24e83e07f259b7b0a261e23c9a5 Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Fri, 16 May 2025 11:55:54 -0300
Subject: [PATCH 01/17] Deleted unused library

Fix
---
 CMakeLists.txt          |  3 ++-
 clock/CMakeLists.txt    | 10 -------
 clock/time.cpp          | 59 -----------------------------------------
 clock/time.hpp          | 33 -----------------------
 data_transfer/types.hpp |  2 --
 5 files changed, 2 insertions(+), 105 deletions(-)
 delete mode 100644 clock/CMakeLists.txt
 delete mode 100644 clock/time.cpp
 delete mode 100644 clock/time.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08fb06d..6780e1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,9 +36,10 @@ find_package(RocksDB CONFIG REQUIRED)
 
 option(TESTING "Build tests" ON)
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 add_subdirectory(deps)
 add_subdirectory(primitives)
-add_subdirectory(clock)
 add_subdirectory(codec)
 add_subdirectory(common)
 add_subdirectory(crypto)
diff --git a/clock/CMakeLists.txt b/clock/CMakeLists.txt
deleted file mode 100644
index 9bb24ad..0000000
--- a/clock/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-add_library(clock
-    time.cpp
-    )
-target_compile_definitions(clock PRIVATE
-    BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
-    )
-target_link_libraries(clock
-    Boost::date_time
-    outcome
-    )
diff --git a/clock/time.cpp b/clock/time.cpp
deleted file mode 100644
index fffc552..0000000
--- a/clock/time.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-
-#include "clock/time.hpp"
-
-#include <boost/date_time/posix_time/posix_time.hpp>
-
-OUTCOME_CPP_DEFINE_CATEGORY_3(sgns::clock, TimeFromStringError, e) {
-  using sgns::clock::TimeFromStringError;
-  switch (e) {
-    case TimeFromStringError::INVALID_FORMAT:
-      return "Input has invalid format";
-    default:
-      return "Unknown error";
-  }
-}
-
-namespace sgns::clock {
-  static boost::posix_time::ptime kPtimeUnixZero(boost::gregorian::date(1970,
-                                                                        1,
-                                                                        1));
-
-  Time::Time(const UnixTimeNano &unix_time_nano)
-      : unix_time_nano_(unix_time_nano) {}
-
-  std::string Time::time() const {
-    return boost::posix_time::to_iso_extended_string(
-               kPtimeUnixZero
-               + boost::posix_time::nanoseconds(unix_time_nano_.count()))
-           + "Z";
-  }
-
-  UnixTime Time::unixTime() const {
-    return std::chrono::duration_cast<UnixTime>(unix_time_nano_);
-  }
-
-  UnixTimeNano Time::unixTimeNano() const {
-    return unix_time_nano_;
-  }
-
-  bool Time::operator<(const Time &other) const {
-    return this->unix_time_nano_ < other.unix_time_nano_;
-  }
-
-  bool Time::operator==(const Time &other) const {
-    return this->unix_time_nano_ == other.unix_time_nano_;
-  }
-
-  IPFS::outcome::result<Time> Time::fromString(const std::string &str) {
-    if (str.size() != 30 || str[str.size() - 1] != 'Z') {
-      return TimeFromStringError::INVALID_FORMAT;
-    }
-    boost::posix_time::ptime ptime;
-    try {
-      ptime = boost::posix_time::from_iso_extended_string(str);
-    } catch (const boost::bad_lexical_cast &e) {
-      return TimeFromStringError::INVALID_FORMAT;
-    }
-    return Time(UnixTimeNano((ptime - kPtimeUnixZero).total_nanoseconds()));
-  }
-}  // namespace sgns::clock
diff --git a/clock/time.hpp b/clock/time.hpp
deleted file mode 100644
index 4e05a55..0000000
--- a/clock/time.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#ifndef CPP_IPFS_LITE_CLOCK_TIME_HPP
-#define CPP_IPFS_LITE_CLOCK_TIME_HPP
-
-#include <chrono>
-#include <string>
-
-#include "common/outcome.hpp"
-
-namespace sgns::clock {
-  enum class TimeFromStringError { INVALID_FORMAT = 1 };
-
-  using UnixTime = std::chrono::seconds;
-  using UnixTimeNano = std::chrono::nanoseconds;
-
-  class Time {
-   public:
-    explicit Time(const UnixTimeNano &unix_time_nano);
-    std::string time() const;
-    UnixTime unixTime() const;
-    UnixTimeNano unixTimeNano() const;
-    bool operator<(const Time &other) const;
-    bool operator==(const Time &other) const;
-    static IPFS::outcome::result<Time> fromString(const std::string &str);
-
-   private:
-    UnixTimeNano unix_time_nano_;
-  };
-}  // namespace sgns::clock
-
-OUTCOME_HPP_DECLARE_ERROR_2(sgns::clock, TimeFromStringError);
-
-#endif  // CPP_IPFS_LITE_CLOCK_TIME_HPP
diff --git a/data_transfer/types.hpp b/data_transfer/types.hpp
index 5ed67fb..433aa42 100644
--- a/data_transfer/types.hpp
+++ b/data_transfer/types.hpp
@@ -2,7 +2,6 @@
 #define CPP_IPFS_LITE_DATA_TRANSFER_TYPES_HPP
 
 #include <libp2p/peer/peer_id.hpp>
-#include "clock/time.hpp"
 #include "primitives/cid/cid.hpp"
 #include "ipfs_lite/ipfs/graphsync/graphsync.hpp"
 #include "ipfs_lite/ipld/ipld_node.hpp"
@@ -123,7 +122,6 @@ namespace sgns::data_transfer {
   struct Event {
     EventCode code;         // What type of event it is
     std::string message;    // Any clarifying information about the event
-    clock::Time timestamp;  // when the event happened
   };
 
   /**

From 812c0350a4198c13fb2431c8b3e7819049348e93 Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Fri, 16 May 2025 16:49:02 -0300
Subject: [PATCH 02/17] Removed unused rle codec

---
 codec/CMakeLists.txt                          |   1 -
 codec/rle/CMakeLists.txt                      |   9 -
 codec/rle/rle_plus.hpp                        |  49 -----
 codec/rle/rle_plus_config.hpp                 |  43 -----
 codec/rle/rle_plus_decoding_stream.hpp        | 175 ------------------
 codec/rle/rle_plus_encoding_stream.cpp        |  16 --
 codec/rle/rle_plus_encoding_stream.hpp        | 129 -------------
 codec/rle/rle_plus_errors.cpp                 |  18 --
 codec/rle/rle_plus_errors.hpp                 |  34 ----
 test/core/codec/rleplus/CMakeLists.txt        |   7 -
 .../codec/rleplus/rle_plus_codec_test.cpp     | 138 --------------
 .../codec/rleplus/rle_plus_codec_tester.hpp   |  73 --------
 12 files changed, 692 deletions(-)
 delete mode 100644 codec/rle/CMakeLists.txt
 delete mode 100644 codec/rle/rle_plus.hpp
 delete mode 100644 codec/rle/rle_plus_config.hpp
 delete mode 100644 codec/rle/rle_plus_decoding_stream.hpp
 delete mode 100644 codec/rle/rle_plus_encoding_stream.cpp
 delete mode 100644 codec/rle/rle_plus_encoding_stream.hpp
 delete mode 100644 codec/rle/rle_plus_errors.cpp
 delete mode 100644 codec/rle/rle_plus_errors.hpp
 delete mode 100644 test/core/codec/rleplus/CMakeLists.txt
 delete mode 100644 test/core/codec/rleplus/rle_plus_codec_test.cpp
 delete mode 100644 test/core/codec/rleplus/rle_plus_codec_tester.hpp

diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt
index c55779e..e3e75ec 100644
--- a/codec/CMakeLists.txt
+++ b/codec/CMakeLists.txt
@@ -1,2 +1 @@
 add_subdirectory(cbor)
-add_subdirectory(rle)
diff --git a/codec/rle/CMakeLists.txt b/codec/rle/CMakeLists.txt
deleted file mode 100644
index 672558e..0000000
--- a/codec/rle/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-add_library(rle_plus_codec
-    rle_plus_encoding_stream.cpp
-    rle_plus_errors.cpp
-    )
-
-target_link_libraries(rle_plus_codec
-    Boost::boost
-    outcome
-  )
diff --git a/codec/rle/rle_plus.hpp b/codec/rle/rle_plus.hpp
deleted file mode 100644
index c248de9..0000000
--- a/codec/rle/rle_plus.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef CODEC_RLE_PLUS_HPP
-#define CODEC_RLE_PLUS_HPP
-
-#include "common/outcome.hpp"
-#include "codec/rle/rle_plus_errors.hpp"
-#include "codec/rle/rle_plus_decoding_stream.hpp"
-#include "codec/rle/rle_plus_encoding_stream.hpp"
-
-namespace sgns::codec::rle {
-  /**
-   * @brief RLE+ encode
-   * @tparam T - type of elements to encode
-   * @tparam A - std::set allocator
-   * @param input - data to encode
-   * @return Encoded byte-vector
-   */
-  template <typename T, typename A>
-  std::vector<uint8_t> encode(const std::set<T, A> &input) {
-    RLEPlusEncodingStream encoder;
-    encoder << input;
-    return encoder.data();
-  }
-
-  /**
-   * @brief RLE+ decode
-   * @tparam T - type of elements to decode
-   * @param input - data to decode
-   * @return Decoded data
-   */
-  template <typename T>
-  IPFS::outcome::result<std::set<T>> decode(gsl::span<const uint8_t> input) {
-    std::set<T> data;
-    RLEPlusDecodingStream decoder(input);
-    try {
-      decoder >> data;
-    } catch (errors::VersionMismatch&) {
-      return RLEPlusDecodeError::VersionMismatch;
-    } catch (errors::IndexOutOfBound&) {
-      return RLEPlusDecodeError::DataIndexFailure;
-    } catch (errors::UnpackBytesOverflow&) {
-      return RLEPlusDecodeError::UnpackOverflow;
-    } catch (errors::MaxSizeExceed&) {
-      return RLEPlusDecodeError::MaxSizeExceed;
-    }
-    return data;
-  }
-};  // namespace sgns::codec::rle
-
-#endif
diff --git a/codec/rle/rle_plus_config.hpp b/codec/rle/rle_plus_config.hpp
deleted file mode 100644
index 7aab677..0000000
--- a/codec/rle/rle_plus_config.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#ifndef CODEC_RLE_PLUS_CONFIG_HPP
-#define CODEC_RLE_PLUS_CONFIG_HPP
-
-namespace sgns::codec::rle {
-  /**
-   * @var Num of bits to store small block value
-   */
-  const int SMALL_BLOCK_LENGTH = 0x04;
-
-  /**
-   * @var Bitwise shift size for pack block value
-   */
-  const int PACK_BYTE_SHIFT = 0x07;
-
-  /**
-   * @var Num of bits in the byte
-   */
-  const int BYTE_BITS_COUNT = 0x08;
-
-  /**
-   * @var Value of the long block
-   */
-  const int LONG_BLOCK_VALUE = 0x10;
-
-  /**
-   * @var Bitwise mask for unpack long block value
-   */
-  const int UNPACK_BYTE_MASK = 0x7F;
-
-  /**
-   * @var MSB value
-   */
-  const int BYTE_SLICE_VALUE = 0x80;
-
-  /**
-   * @var Maximum object size to encode or decode
-   */
-  const int OBJECT_MAX_SIZE = 0x100000;
-
-};  // namespace sgns::codec::rle
-
-#endif
diff --git a/codec/rle/rle_plus_decoding_stream.hpp b/codec/rle/rle_plus_decoding_stream.hpp
deleted file mode 100644
index 860dc7a..0000000
--- a/codec/rle/rle_plus_decoding_stream.hpp
+++ /dev/null
@@ -1,175 +0,0 @@
-#ifndef CPP_IPFS_LITE_RLE_PLUS_DECODING_STREAM_HPP
-#define CPP_IPFS_LITE_RLE_PLUS_DECODING_STREAM_HPP
-
-#include <vector>
-#include <set>
-
-#include <boost/dynamic_bitset.hpp>
-#include <gsl/span>
-
-#include "codec/rle/rle_plus_config.hpp"
-#include "codec/rle/rle_plus_errors.hpp"
-
-namespace sgns::codec::rle {
-  /**
-   * @class Decode RLE+ byte stream
-   */
-  class RLEPlusDecodingStream {
-   public:
-    /**
-     * @brief Constructor
-     * @param data - RLE+ encoded bytes
-     */
-    explicit RLEPlusDecodingStream(gsl::span<const uint8_t> data)
-        : index_{}, magnitude_{}, content_{data.begin(), data.end()} {}
-
-    /**
-     * @brief Decode RLE+
-     * @tparam T - type of output data
-     * @param output - decoded data
-     * @return Decoded stream
-     */
-    template <typename T>
-    RLEPlusDecodingStream &operator>>(std::set<T> &output) {
-      if ((content_.size() < SMALL_BLOCK_LENGTH)
-          || (getSpan<uint8_t>(2) != 0)) {
-        throw errors::VersionMismatch();
-      }
-      magnitude_ = getSpan<uint8_t>(1) == 1;
-      T value = 0;
-      while (content_.find_next(index_ - 1)
-             != boost::dynamic_bitset<uint8_t>::npos) {
-        auto header = getSpan<uint8_t>(1);
-        if (header == 1) {
-          decodeSingleBlock(value, output);
-        } else if (header == 0) {
-          auto block_header = getSpan<uint8_t>(1);
-          if (block_header == 0) {
-            decodeLongBlock(value, output);
-          } else {
-            decodeSmallBlock(value, output);
-          }
-        }
-      }
-      constexpr size_t max_size = OBJECT_MAX_SIZE / sizeof(T);
-      if (output.size() > max_size) {
-        throw errors::MaxSizeExceed();
-      }
-      return *this;
-    }
-
-   private:
-    size_t index_;   /**< Content's current index */
-    bool magnitude_; /**< Polarity of the current index */
-    boost::dynamic_bitset<uint8_t> content_; /**< Encoded data */
-
-    /**
-     * @brief Get bit span, represented as T
-     * @tparam T - type of value to return
-     * @param count - number of bits to use
-     * @return Bits [index_ : index_ + count], represented as T
-     */
-    template <typename T>
-    T getSpan(size_t count) {
-      T value{};
-      size_t shift = 0;
-      const size_t end = index_ + count;
-      if (content_.size() < end) {
-        throw errors::IndexOutOfBound();
-      }
-      for (size_t i = index_; i < end; ++i) {
-        T slice = content_.test(i) ? 1 : 0;
-        value |= slice << shift;
-        ++shift;
-      }
-      index_ += count;
-      return value;
-    }
-
-    /**
-     * @brief Unpack bytes to T
-     * @tparam T - type of the value to return
-     * @param data - packed bytes
-     * @return Unpacked data
-     */
-    template <typename T>
-    T unpack(const std::vector<uint8_t> &data) {
-      T value{};
-      size_t shift{};
-      const size_t max_shift = sizeof(T) * BYTE_BITS_COUNT;
-      for (const auto &byte : data) {
-        if (shift > max_shift) {
-          throw errors::UnpackBytesOverflow{};
-        }
-        if (byte < BYTE_SLICE_VALUE) {
-          value = value | (static_cast<T>(byte) << shift);
-          break;
-        }
-        value |= static_cast<T>(byte & UNPACK_BYTE_MASK) << shift;
-        shift += PACK_BYTE_SHIFT;
-      }
-      return value;
-    }
-
-    /**
-     * @brief Decode single RLE+ block
-     * @tparam T - type of the data to output
-     * @param current_value - index of the current number
-     * @param output - decoded data
-     */
-    template <typename T>
-    void decodeSingleBlock(T &current_value, std::set<T> &output) {
-      if (magnitude_) {
-        output.insert(current_value);
-      }
-      magnitude_ = !magnitude_;
-      current_value++;
-    }
-
-    /**
-     * @brief Decode small RLE+ block
-     * @tparam T - type of the data to output
-     * @param current_value - index of the current number
-     * @param output - decoded data
-     */
-    template <typename T>
-    void decodeSmallBlock(T &current_value, std::set<T> &output) {
-      size_t length = getSpan<uint8_t>(SMALL_BLOCK_LENGTH);
-      if (magnitude_) {
-        for (size_t i = 0; i < length; ++i) {
-          output.insert(current_value++);
-        }
-      } else {
-        current_value += length;
-      }
-      magnitude_ = !magnitude_;
-    }
-
-    /**
-     * @brief Decode long RLE+ block
-     * @tparam T - type of the data to output
-     * @param current_value - index of the current number
-     * @param output - decoded data
-     */
-    template <typename T>
-    void decodeLongBlock(T &current_value, std::set<T> &output) {
-      std::vector<uint8_t> bytes{};
-      uint8_t slice;
-      do {
-        slice = getSpan<uint8_t>(BYTE_BITS_COUNT);
-        bytes.push_back(slice);
-      } while ((slice & BYTE_SLICE_VALUE) != 0);
-      T length = unpack<T>(bytes);
-      if (magnitude_) {
-        for (size_t i = 0; i < length; ++i) {
-          output.insert(current_value++);
-        }
-      } else {
-        current_value += length;
-      }
-      magnitude_ = !magnitude_;
-    }
-  };
-};  // namespace sgns::codec::rle
-
-#endif
diff --git a/codec/rle/rle_plus_encoding_stream.cpp b/codec/rle/rle_plus_encoding_stream.cpp
deleted file mode 100644
index 5a81cb7..0000000
--- a/codec/rle/rle_plus_encoding_stream.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "codec/rle/rle_plus_encoding_stream.hpp"
-
-namespace sgns::codec::rle {
-  void RLEPlusEncodingStream::initContent() {
-    content_.clear();
-    content_.push_back(false);
-    content_.push_back(false);
-  }
-
-  void RLEPlusEncodingStream::pushByte(uint8_t byte) {
-    for (size_t i = 0; i < BYTE_BITS_COUNT; ++i) {
-      bool bit = static_cast<bool>((byte & (1 << i)) >> i);
-      content_.push_back(bit);
-    }
-  }
-}  // namespace sgns::codec::rle
diff --git a/codec/rle/rle_plus_encoding_stream.hpp b/codec/rle/rle_plus_encoding_stream.hpp
deleted file mode 100644
index 80f7789..0000000
--- a/codec/rle/rle_plus_encoding_stream.hpp
+++ /dev/null
@@ -1,129 +0,0 @@
-#ifndef CPP_IPFS_LITE_RLE_PLUS_ENCODING_STREAM_HPP
-#define CPP_IPFS_LITE_RLE_PLUS_ENCODING_STREAM_HPP
-
-#include <vector>
-#include <set>
-
-#include <boost/dynamic_bitset.hpp>
-
-#include "codec/rle/rle_plus_config.hpp"
-
-namespace sgns::codec::rle {
-  /**
-   * @class RLE+ encoding stream
-   */
-  class RLEPlusEncodingStream {
-   public:
-    /**
-     * @brief Encode integer set
-     * @tparam T - type of integer
-     * @tparam A - set's allocator
-     * @param input - content of the set to encode
-     * @return Encoded stream
-     */
-    template <typename T, typename A>
-    RLEPlusEncodingStream &operator<<(const std::set<T, A> &input) {
-      std::vector<T> periods = this->getPeriods(input);
-      this->initContent();
-      bool flag = false;
-      if (!input.empty()) flag = *input.begin() == 0;
-      content_.push_back(flag);
-      for (const auto &value : periods) {
-        if (value == 1) {
-          content_.push_back(true);
-        } else if (value < LONG_BLOCK_VALUE) {
-          this->pushSmallBlock(value);
-        } else if (value >= LONG_BLOCK_VALUE) {
-          this->pushLongBlock(value);
-        }
-      }
-      return *this;
-    }
-
-    /**
-     * @brief Get encoded stream content
-     * @return Stream content
-     */
-    std::vector<uint8_t> data() const {
-      std::vector<uint8_t> data_content;
-      data_content.reserve(content_.num_blocks());
-      boost::to_block_range(content_, std::back_inserter(data_content));
-      return data_content;
-    }
-
-   private:
-    boost::dynamic_bitset<uint8_t> content_{}; /**< RLE+ encoded content */
-
-    /**
-     * @brief Write RLE+ header
-     */
-    void initContent();
-
-    /**
-     * @brief Write RLE+ small block
-     * @tparam T - type of block value
-     * @param block - value to write
-     */
-    template <typename T>
-    void pushSmallBlock(const T block) {
-      content_.push_back(false);
-      content_.push_back(true);
-      for (size_t i = 0; i < SMALL_BLOCK_LENGTH; ++i) {
-        content_.push_back((block & (1 << i)) >> i);
-      }
-    }
-
-    /**
-     * @brief Write RLE+ long block
-     * @tparam T - type of block value
-     * @param block - value to write
-     */
-    template <typename T>
-    void pushLongBlock(const T block) {
-      uint8_t byte{};
-      T slice = block;
-      content_.push_back(false);
-      content_.push_back(false);
-      while (slice >= BYTE_SLICE_VALUE) {
-        byte = slice | BYTE_SLICE_VALUE;
-        this->pushByte(byte);
-        slice >>= PACK_BYTE_SHIFT;
-      }
-      this->pushByte(static_cast<uint8_t>(slice));
-    }
-
-    /**
-     * @brief Write various byte
-     * @param byte - content to write
-     */
-    void pushByte(uint8_t byte);
-
-    /**
-     * @brief RLE+ logic - calculate periods of the integers
-     * @tparam T - type of the integers
-     * @tparam A - set's allocator
-     * @param data - input set of the integers
-     * @return Periods length
-     */
-    template <typename T, typename A>
-    std::vector<T> getPeriods(const std::set<T, A> &data) const {
-      std::vector<T> periods{};
-      T prev = !data.empty() ? *data.begin() : 0;
-      if (prev != 0) periods.push_back(prev);
-      if (data.empty()) return periods;
-      periods.push_back(1);
-      for (auto index = ++data.begin(); index != data.end(); ++index) {
-        T diff = *index - prev;
-        if (diff == 1) periods.back()++;
-        if (diff > 1) {
-          periods.push_back(diff - 1);
-          periods.push_back(1);
-        }
-        prev = *index;
-      }
-      return periods;
-    }
-  };
-};  // namespace sgns::codec::rle
-
-#endif
diff --git a/codec/rle/rle_plus_errors.cpp b/codec/rle/rle_plus_errors.cpp
deleted file mode 100644
index 0f0aa54..0000000
--- a/codec/rle/rle_plus_errors.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#include "codec/rle/rle_plus_errors.hpp"
-
-OUTCOME_CPP_DEFINE_CATEGORY_3(sgns::codec::rle, RLEPlusDecodeError, e) {
-  using sgns::codec::rle::RLEPlusDecodeError;
-  switch (e) {
-    case (RLEPlusDecodeError::VersionMismatch):
-      return "RLE+ data header has invalid version";
-    case (RLEPlusDecodeError::DataIndexFailure):
-      return "RLE+ incorrect structure";
-    case (RLEPlusDecodeError::UnpackOverflow):
-      return "RLE+ invalid encoding";
-    case (RLEPlusDecodeError::MaxSizeExceed):
-      return "RLE+ object size too large";
-    default:
-      return "RLE+ unknown error";
-  }
-}
diff --git a/codec/rle/rle_plus_errors.hpp b/codec/rle/rle_plus_errors.hpp
deleted file mode 100644
index 49dbd10..0000000
--- a/codec/rle/rle_plus_errors.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#ifndef CORE_CODEC_RLE_PLUS_ERRORS_HPP
-#define CORE_CODEC_RLE_PLUS_ERRORS_HPP
-
-#include "common/outcome.hpp"
-
-namespace sgns::codec::rle {
-
-  namespace errors {
-
-    struct VersionMismatch : public std::exception {};
-
-    struct IndexOutOfBound : public std::exception {};
-
-    struct UnpackBytesOverflow : public std::exception {};
-
-    struct MaxSizeExceed : public std::exception {};
-
-  }  // namespace errors
-
-  /**
-   * @class RLE+ decode errors
-   */
-  enum class RLEPlusDecodeError : int {
-    VersionMismatch = 1, /**< RLE+ data header has invalid version */
-    DataIndexFailure,    /**< RLE+ incorrect structure */
-    UnpackOverflow,      /**< RLE+ invalid encoding */
-    MaxSizeExceed        /**< RLE+ object size too large */
-  };
-}  // namespace sgns::codec::rle
-
-OUTCOME_HPP_DECLARE_ERROR_2(sgns::codec::rle, RLEPlusDecodeError);
-
-#endif
diff --git a/test/core/codec/rleplus/CMakeLists.txt b/test/core/codec/rleplus/CMakeLists.txt
deleted file mode 100644
index 898d889..0000000
--- a/test/core/codec/rleplus/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-addtest(rle_plus_codec_test
-    rle_plus_codec_test.cpp
-    )
-
-target_link_libraries(rle_plus_codec_test
-    rle_plus_codec
-    )
diff --git a/test/core/codec/rleplus/rle_plus_codec_test.cpp b/test/core/codec/rleplus/rle_plus_codec_test.cpp
deleted file mode 100644
index c4c1078..0000000
--- a/test/core/codec/rleplus/rle_plus_codec_test.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#include <gtest/gtest.h>
-
-#include "core/codec/rleplus/rle_plus_codec_tester.hpp"
-
-using sgns::codec::rle::decode;
-using sgns::codec::rle::RLEPlusDecodeError;
-using sgns::codec::rle::encode;
-
-using types = testing::Types<uint8_t, uint16_t, uint32_t, uint64_t>;
-
-TYPED_TEST_CASE(RLEPlusCodecTester, types);
-
-/**
- * @given Null set of data
- * @when RLE+ encode and following decode back
- * @then Operations must be completed successfully and decoded data must be the
- * same as the given set
- */
-TYPED_TEST(RLEPlusCodecTester, NullDataSuccess) {
-  this->checkDataSet({});
-}
-
-/**
- * @given Data set with single content
- * @when RLE+ encode and following decode back
- * @then Operations must be completed successfully and decoded data must be the
- * same as the given set
- */
-TYPED_TEST(RLEPlusCodecTester, ZeroDataSuccess) {
-  this->checkDataSet({0});
-}
-
-/**
- * @given Data set with single content
- * @when RLE+ encode and following decode back
- * @then Operations must be completed successfully and decoded data must be the
- * same as the given set
- */
-TYPED_TEST(RLEPlusCodecTester, OneDataSuccess) {
-  this->checkDataSet({1});
-}
-
-/**
- * @given Set of single blocks from T::min to T::max
- * @when RLE+ encode and following decode back
- * @then Operations must be completed successfully and decoded data must be the
- * same as the given set
- */
-TYPED_TEST(RLEPlusCodecTester, SingleBlocksFromZeroSuccess) {
-  auto &&data_set =
-      this->generateDataSet(std::numeric_limits<TypeParam>::min(),
-                            std::numeric_limits<TypeParam>::max(),
-                            [](TypeParam prev) { return prev += 2; });
-  this->checkDataSet(data_set);
-}
-
-/**
- * @given Set of single blocks from T::max / 2 to T::max
- * @when RLE+ encode and following decode back
- * @then Operations must be completed successfully and decoded data must be the
- * same as the given set
- */
-TYPED_TEST(RLEPlusCodecTester, SignleBlocksFromMiddleSuccess) {
-  auto &&data_set =
-      this->generateDataSet(std::numeric_limits<TypeParam>::max() / 2,
-                            std::numeric_limits<TypeParam>::max(),
-                            [](TypeParam prev) { return prev += 2; });
-  this->checkDataSet(data_set);
-}
-
-/**
- * @given Set of mixed type blocks
- * @when RLE+ encode and following decode back
- * @then Operations must be completed successfully and decoded data must be the
- * same as the given set
- */
-TYPED_TEST(RLEPlusCodecTester, MixedBlocksSuccess) {
-  auto &&data_set = this->generateDataSet(
-      std::numeric_limits<TypeParam>::min(),
-      std::numeric_limits<TypeParam>::max() / static_cast<TypeParam>(5),
-      [](TypeParam prev) -> TypeParam { return prev += (prev % 100) + 1; });
-  this->checkDataSet(data_set);
-}
-
-/**
- * @given RLE+ encoded data with invalid header version
- * @when RLE+ decode given data
- * @then Decode operation must be failed with appropriate error code
- */
-TYPED_TEST(RLEPlusCodecTester, InvalidHeaderDecodeFailure) {
-  auto expected = RLEPlusDecodeError::VersionMismatch;
-  std::vector<uint8_t> data{0xFF, 0x8, 0x15, 0x16};
-  this->checkDecodeFailure(data, expected);
-}
-
-/**
- * @given RLE+ encoded data with invalid structure
- * @when RLE+ decode given data
- * @then Decode operation must be failed with appropriate error code
- */
-TYPED_TEST(RLEPlusCodecTester, InvalidStructureDecodeFailure) {
-  auto expected = RLEPlusDecodeError::DataIndexFailure;
-  std::vector<uint8_t> data{0x4, 0x8, 0x15, 0x16};
-  this->checkDecodeFailure(data, expected);
-}
-
-/**
- * @given Reference RLE+ encoded and decoded data
- * @when RLE+ encode given data
- * @tparam Decode operation must be successful and decoded data must be the same
- * as the given
- */
-TYPED_TEST(RLEPlusCodecTester, ReferenceComparingSuccess) {
-  auto encoded = encode(this->reference_decoded_sample_);
-  EXPECT_OUTCOME_TRUE(decoded, decode<TypeParam>(encoded));
-  ASSERT_EQ(decoded, this->reference_decoded_sample_);
-}
-
-/**
- * @given RLE+ encoded data, which exceeds max object size
- * @when RLE+ decode given data
- * @then Decode operation must be failed with appropriate error code
- */
-TEST(RLEPlusDecode, MaxSizeExceedFailure) {
-  std::set<uint64_t> data_set;
-  constexpr size_t max_length =
-      sgns::codec::rle::OBJECT_MAX_SIZE / sizeof(uint64_t) + 1;
-  uint64_t value = 0;
-  for (size_t i = 0; i < max_length; ++i) {
-    data_set.emplace(value);
-    value += 2;
-  }
-  auto encoded = encode(data_set);
-  auto expected = RLEPlusDecodeError::MaxSizeExceed;
-  auto result = decode<uint64_t>(encoded);
-  ASSERT_TRUE(result.has_error());
-  ASSERT_EQ(result.error().value(), static_cast<int>(expected));
-}
diff --git a/test/core/codec/rleplus/rle_plus_codec_tester.hpp b/test/core/codec/rleplus/rle_plus_codec_tester.hpp
deleted file mode 100644
index 0bad5a6..0000000
--- a/test/core/codec/rleplus/rle_plus_codec_tester.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-#ifndef TEST_CORE_CODEC_RLE_PLUS_CODEC_TESTER_HPP
-#define TEST_CORE_CODEC_RLE_PLUS_CODEC_TESTER_HPP
-
-#include <limits>
-
-#include <gtest/gtest.h>
-
-#include "codec/rle/rle_plus.hpp"
-#include "testutil/outcome.hpp"
-
-/**
- * @class Test fixture for RLE+ unit tests
- * @tparam T - type of data for codec
- */
-template <typename T>
-class RLEPlusCodecTester : public ::testing::Test {
- protected:
-  /**
-   * @var Decoded sample, produced by reference go lang implementation
-   */
-  std::set<T> reference_decoded_sample_{0,  2,  4,  5,  6,  11, 12, 13,
-                                        14, 15, 16, 17, 18, 19, 20, 21,
-                                        22, 23, 24, 25, 26, 27};
-
-  /**
-   * @var Encoded sample, produced by reference go lang implementation
-   */
-  std::set<T> reference_encoded_sample_{0x7C, 0x47, 0x22, 0x2};
-
-  /**
-   * @brief Codec algorithm check
-   * @param data_set - data for test
-   */
-  void checkDataSet(const std::set<T> &data_set) {
-    auto encoded = sgns::codec::rle::encode(data_set);
-    EXPECT_OUTCOME_TRUE(decoded, sgns::codec::rle::decode<T>(encoded))
-    ASSERT_EQ(data_set, decoded);
-  }
-
-  /**
-   * @brief Codec algorithm error handling check
-   * @param data - data for test
-   * @param e - expected error code
-   */
-  void checkDecodeFailure(const std::vector<uint8_t> &data,
-                          sgns::codec::rle::RLEPlusDecodeError e) {
-    auto result = sgns::codec::rle::decode<T>(data);
-    ASSERT_TRUE(result.has_error());
-    ASSERT_EQ(result.error().value(), static_cast<int>(e));
-  }
-
-  /**
-   * @brief Generate sample data set with specific params
-   * @param value - start value of the set
-   * @param end - max data set value
-   * @param next - lambda to generate next data set value
-   * @return Generated data set
-   */
-  std::set<T> generateDataSet(T value, T end, T (*next)(T)) {
-    std::set<T> data;
-    const size_t max_length =
-        sgns::codec::rle::OBJECT_MAX_SIZE / sizeof(T);
-    for (size_t i = 0; (i < max_length) && (value != end); ++i) {
-      data.emplace(value);
-      value = next(value);
-    }
-    return data;
-  }
-};
-
-#endif

From a801bee38970c50a4ccc7a7f0414cb46b3d48972 Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Mon, 19 May 2025 09:34:00 -0300
Subject: [PATCH 03/17] Cbor renaming

---
 common/libp2p/cbor_stream.cpp         | 20 +++++++++++---------
 common/libp2p/cbor_stream.hpp         |  2 +-
 common/libp2p/peer/cbor_peer_info.hpp |  3 +--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/common/libp2p/cbor_stream.cpp b/common/libp2p/cbor_stream.cpp
index b8c66b8..f0c4f0a 100644
--- a/common/libp2p/cbor_stream.cpp
+++ b/common/libp2p/cbor_stream.cpp
@@ -23,20 +23,22 @@ namespace sgns::common::libp2p {
 
   void CborStream::readMore(ReadCallbackFunc cb) {
     if (buffering_.done()) {
-      return cb(gsl::make_span(buffer_).subspan(0, size_));
+        cb(gsl::make_span(buffer_).subspan(0, size_));
+        return;
     }
-    buffer_.resize(size_ + kReserveBytes);
+
+    buffer_.resize(size_ + kMaxBytesToRead);
     stream_->readSome(
         gsl::make_span(buffer_).subspan(size_),
-        kReserveBytes,
+        kMaxBytesToRead,
         [cb{std::move(cb)}, self{shared_from_this()}](auto count) {
-          if (!count) {
+        if (!count) {
             return cb(count.error());
-          }
-          self->buffer_.resize(self->size_ + count.value());
-          self->consume(gsl::make_span(self->buffer_).subspan(self->size_),
-                        std::move(cb));
-        });
+        }
+        self->buffer_.resize(self->size_ + count.value());
+        self->consume(gsl::make_span(self->buffer_).subspan(self->size_), std::move(cb));
+    }
+    );
   }
 
   void CborStream::consume(gsl::span<uint8_t> input, ReadCallbackFunc cb) {
diff --git a/common/libp2p/cbor_stream.hpp b/common/libp2p/cbor_stream.hpp
index 2f435b4..71fed80 100644
--- a/common/libp2p/cbor_stream.hpp
+++ b/common/libp2p/cbor_stream.hpp
@@ -17,7 +17,7 @@ namespace sgns::common::libp2p {
     using WriteCallbackFunc = Stream::WriteCallbackFunc;
 
     /// Max number of bytes to read at a time
-    static constexpr size_t kReserveBytes = 4 << 10;
+    static constexpr size_t kMaxBytesToRead = 4 << 10;
 
     explicit CborStream(std::shared_ptr<Stream> stream);
 
diff --git a/common/libp2p/peer/cbor_peer_info.hpp b/common/libp2p/peer/cbor_peer_info.hpp
index f238fa3..913dcc3 100644
--- a/common/libp2p/peer/cbor_peer_info.hpp
+++ b/common/libp2p/peer/cbor_peer_info.hpp
@@ -1,9 +1,8 @@
 #ifndef CPP_IPFS_LITE_COMMON_LIBP2P_PEER_CBOR_PEER_INFO_HPP
 #define CPP_IPFS_LITE_COMMON_LIBP2P_PEER_CBOR_PEER_INFO_HPP
 
-#include <libp2p/peer/peer_id.hpp>
+#include <libp2p/peer/peer_info.hpp>
 #include "codec/cbor/streams_annotation.hpp"
-#include "common/libp2p/multi/cbor_multiaddress.hpp"
 #include "common/libp2p/peer/cbor_peer_id.hpp"
 
 using libp2p::peer::PeerId;

From a6cb4e2dfd5a52354eb5e30f32a442bb6da8adaa Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Mon, 19 May 2025 12:54:10 -0300
Subject: [PATCH 04/17] Removed unused functions

---
 codec/cbor/cbor_encode_stream.hpp |  4 +-
 common/CMakeLists.txt             |  7 ---
 common/enum.hpp                   | 34 -----------
 common/hexutil.cpp                | 22 -------
 common/hexutil.hpp                |  8 ---
 common/logger.hpp                 |  3 -
 common/mp_utils.hpp               |  8 ---
 common/todo_error.cpp             |  9 ---
 common/todo_error.hpp             | 14 -----
 common/visitor.hpp                | 98 -------------------------------
 common/wrapper.hpp                | 58 ------------------
 test/core/common/outcome_test.cpp | 23 --------
 test/testutil/outcome.hpp         |  1 -
 13 files changed, 2 insertions(+), 287 deletions(-)
 delete mode 100644 common/enum.hpp
 delete mode 100644 common/todo_error.cpp
 delete mode 100644 common/todo_error.hpp
 delete mode 100644 common/visitor.hpp
 delete mode 100644 common/wrapper.hpp

diff --git a/codec/cbor/cbor_encode_stream.hpp b/codec/cbor/cbor_encode_stream.hpp
index 9b66cba..9c0fc11 100644
--- a/codec/cbor/cbor_encode_stream.hpp
+++ b/codec/cbor/cbor_encode_stream.hpp
@@ -4,11 +4,11 @@
 #include "codec/cbor/cbor_common.hpp"
 
 #include <array>
+#include <type_traits>
 #include <vector>
 
 #include <cbor.h>
 
-#include "common/enum.hpp"
 #include "platform/platform.hpp"
 
 namespace sgns::codec::cbor {
@@ -23,7 +23,7 @@ namespace sgns::codec::cbor {
         typename = std::enable_if_t<std::is_integral_v<T> || std::is_enum_v<T>>>
     CborEncodeStream &operator<<(T num) {
       if constexpr (std::is_enum_v<T>) {
-        return *this << common::to_int(num);
+        return *this << static_cast<std::underlying_type<T>>(num);
       }
       addCount(1);
       std::array<uint8_t, 9> buffer{0};
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 51a5a69..3c74d10 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -34,13 +34,6 @@ target_link_libraries(logger
     )
 add_subdirectory(libp2p)
 
-add_library(todo_error
-    todo_error.hpp
-    todo_error.cpp
-    )
-target_link_libraries(todo_error
-    outcome
-    )
 add_library(mp_utils
     mp_utils.cpp
     mp_utils.hpp
diff --git a/common/enum.hpp b/common/enum.hpp
deleted file mode 100644
index e0e5e1a..0000000
--- a/common/enum.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef CPP_IPFS_LITE__COMMON_ENUM_HPP
-#define CPP_IPFS_LITE__COMMON_ENUM_HPP
-
-namespace sgns::common {
-
-  /**
-   * @brief Convert enum class value as integer
-   * Usage:
-   *   Given an enum class
-   *   @code
-   *   enum class Enumerator {
-   *     one = 1,
-   *     eleven = 11,
-   *     hundred = 100
-   *   }
-   *   @nocode
-   *   Can be converted as:
-   *   @code
-   *   int v = to_int(Enumerator::eleven); // v == 11
-   *   @nocode
-   *
-   * @tparam Enumeration - enum type
-   * @param value - to convert
-   * @return integer value of enum
-   */
-  template <typename Enumeration>
-  auto to_int(Enumeration const value) ->
-      typename std::underlying_type<Enumeration>::type {
-    return static_cast<typename std::underlying_type<Enumeration>::type>(value);
-  }
-
-}  // namespace sgns::common
-
-#endif  // CPP_IPFS_LITE__COMMON_ENUM_HPP
diff --git a/common/hexutil.cpp b/common/hexutil.cpp
index c274bad..4b76ed5 100644
--- a/common/hexutil.cpp
+++ b/common/hexutil.cpp
@@ -23,34 +23,12 @@ OUTCOME_CPP_DEFINE_CATEGORY_3(sgns::common, UnhexError, e) {
 
 namespace sgns::common {
 
-  std::string int_to_hex(uint64_t n, size_t fixed_width) noexcept {
-    std::stringstream result;
-    result.width(fixed_width);
-    result.fill('0');
-    result << std::hex << std::uppercase << n;
-    auto str = result.str();
-    if (str.length() % 2 != 0) {
-      str.push_back('\0');
-      for (int64_t i = str.length() - 2; i >= 0; --i) {
-        str[i + 1] = str[i];
-      }
-      str[0] = '0';
-    }
-    return str;
-  }
-
   std::string hex_upper(const gsl::span<const uint8_t> bytes) noexcept {
     std::string res(bytes.size() * 2, '\x00');
     boost::algorithm::hex(bytes.begin(), bytes.end(), res.begin());
     return res;
   }
 
-  std::string hex_lower(const gsl::span<const uint8_t> bytes) noexcept {
-    std::string res(bytes.size() * 2, '\x00');
-    boost::algorithm::hex_lower(bytes.begin(), bytes.end(), res.begin());
-    return res;
-  }
-
   IPFS::outcome::result<std::vector<uint8_t>> unhex(std::string_view hex) {
     std::vector<uint8_t> blob;
     blob.reserve((hex.size() + 1) / 2);
diff --git a/common/hexutil.hpp b/common/hexutil.hpp
index 4f4be2c..c556eb7 100644
--- a/common/hexutil.hpp
+++ b/common/hexutil.hpp
@@ -27,14 +27,6 @@ namespace sgns::common {
    */
   std::string hex_upper(gsl::span<const uint8_t> bytes) noexcept;
 
-  /**
-   * @brief Converts bytes to hex representation
-   * @param array bytes
-   * @param len length of bytes
-   * @return hexstring
-   */
-  std::string hex_lower(gsl::span<const uint8_t> bytes) noexcept;
-
   /**
    * @brief Converts hex representation to bytes
    * @param array individual chars
diff --git a/common/logger.hpp b/common/logger.hpp
index 793e9b6..8e93fa5 100644
--- a/common/logger.hpp
+++ b/common/logger.hpp
@@ -1,9 +1,6 @@
-
 #ifndef CPP_IPFS_LITE_LOGGER_HPP
 #define CPP_IPFS_LITE_LOGGER_HPP
 
-
-
 #include <spdlog/fmt/ostr.h>
 #include <spdlog/spdlog.h>
 namespace sgns {
diff --git a/common/mp_utils.hpp b/common/mp_utils.hpp
index c9b6813..9cbad34 100644
--- a/common/mp_utils.hpp
+++ b/common/mp_utils.hpp
@@ -8,14 +8,6 @@
 
 namespace sgns::common {
 
-  namespace detail {
-    template <size_t size, typename uint>
-    std::array<uint8_t, size> uint_to_bytes(uint &&i);
-
-    template <size_t size, typename uint>
-    uint bytes_to_uint(gsl::span<uint8_t, size> bytes);
-  }  // namespace detail
-
   std::array<uint8_t, 8> uint64_t_to_bytes(uint64_t number);
 
   uint64_t bytes_to_uint64_t(gsl::span<uint8_t, 8> bytes);
diff --git a/common/todo_error.cpp b/common/todo_error.cpp
deleted file mode 100644
index 3cba853..0000000
--- a/common/todo_error.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "common/todo_error.hpp"
-
-OUTCOME_CPP_DEFINE_CATEGORY_3(sgns, TodoError, e) {
-  using E = sgns::TodoError;
-  switch (e) {
-    case E::ERROR:
-      return "Error";
-  }
-}
diff --git a/common/todo_error.hpp b/common/todo_error.hpp
deleted file mode 100644
index d6f8dba..0000000
--- a/common/todo_error.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef CPP_IPFS_LITE_COMMON_TODO_ERROR_HPP
-#define CPP_IPFS_LITE_COMMON_TODO_ERROR_HPP
-
-#include "common/outcome.hpp"
-
-namespace sgns {
-  enum class TodoError {
-    ERROR = 1,
-  };
-}  // namespace sgns
-
-OUTCOME_HPP_DECLARE_ERROR_2(sgns, TodoError);
-
-#endif  // CPP_IPFS_LITE_COMMON_TODO_ERROR_HPP
diff --git a/common/visitor.hpp b/common/visitor.hpp
deleted file mode 100644
index 1ff1409..0000000
--- a/common/visitor.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-
-#ifndef CPP_IPFS_LITE_VISITOR_HPP
-#define CPP_IPFS_LITE_VISITOR_HPP
-
-#include <type_traits>  // for std::decay
-#include <utility>      // for std::forward
-
-#include <boost/variant/apply_visitor.hpp>  // for boost::apply_visitor
-
-namespace sgns {
-
-  template <typename... Lambdas>
-  struct lambda_visitor;
-
-  template <typename Lambda, typename... Lambdas>
-  struct lambda_visitor<Lambda, Lambdas...>
-      : public Lambda, public lambda_visitor<Lambdas...> {
-    using Lambda::operator();
-    using lambda_visitor<Lambdas...>::operator();
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    lambda_visitor(Lambda lambda, Lambdas... lambdas)
-        : Lambda(lambda), lambda_visitor<Lambdas...>(lambdas...) {}
-  };
-
-  template <typename Lambda>
-  struct lambda_visitor<Lambda> : public Lambda {
-    using Lambda::operator();
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    lambda_visitor(Lambda lambda) : Lambda(lambda) {}
-  };
-
-  /**
-   * @brief Convenient in-place compile-time visitor creation, from a set of
-   * lambdas
-   *
-   * @code
-   * make_visitor([](int a){ return 1; },
-   *              [](std::string b) { return 2; });
-   * @nocode
-   *
-   * is essentially the same as
-   *
-   * @code
-   * struct visitor : public boost::static_visitor<int> {
-   *   int operator()(int a) { return 1; }
-   *   int operator()(std::string b) { return 2; }
-   * }
-   * @nocode
-   *
-   * @param lambdas
-   * @return visitor
-   */
-  template <class... Fs>
-  constexpr auto make_visitor(Fs &&... fs) {
-    using visitor_type = lambda_visitor<std::decay_t<Fs>...>;
-    return visitor_type(std::forward<Fs>(fs)...);
-  }
-
-  /**
-   * @brief Inplace visitor for boost::variant.
-   * @code
-   *   boost::variant<int, std::string> value = "1234";
-   *   ...
-   *   visit_in_place(value,
-   *                  [](int v) { std::cout << "(int)" << v; },
-   *                  [](std::string v) { std::cout << "(string)" << v;}
-   *                  );
-   * @nocode
-   *
-   * @param variant
-   * @param lambdas
-   * @param lambdas
-   */
-  template <typename TVariant, typename... TVisitors>
-  constexpr decltype(auto) visit_in_place(TVariant &&variant,
-                                          TVisitors &&... visitors) {
-    return boost::apply_visitor(
-        make_visitor(std::forward<TVisitors>(visitors)...),
-        std::forward<TVariant>(variant));
-  }
-
-  /// apply Matcher to optional T
-  template <typename T, typename Matcher>
-  constexpr decltype(auto) match(T &&t, Matcher &&m) {
-    return std::forward<T>(t) ? std::forward<Matcher>(m)(*std::forward<T>(t))
-                              : std::forward<Matcher>(m)();
-  }
-
-  /// construct visitor from Fs and apply it to optional T
-  template <typename T, typename... Fs>
-  constexpr decltype(auto) match_in_place(T &&t, Fs &&... fs) {
-    return match(std::forward<T>(t), make_visitor(std::forward<Fs>(fs)...));
-  }
-}  // namespace kagome
-
-#endif  // CPP_IPFS_LITE_VISITOR_HPP
diff --git a/common/wrapper.hpp b/common/wrapper.hpp
deleted file mode 100644
index c45481e..0000000
--- a/common/wrapper.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef CPP_IPFS_LITE_COMMON_WRAPPER_HPP
-#define CPP_IPFS_LITE_COMMON_WRAPPER_HPP
-
-#include <memory>
-#include <type_traits>
-
-#include <boost/operators.hpp>
-
-namespace sgns::common {
-
-  /**
-   * @brief Make strongly typed structures from different concepts of the equal
-   * types. E.g. block height and round number are both uint64_t, but better to
-   * be different types. Or, ID and Signature both vectors.
-   * @tparam T wrapped type
-   * @tparam Tag unique tag
-   */
-  template <typename T, typename Tag>
-  struct Wrapper {
-    explicit Wrapper(T &&t) : data_(std::forward<T>(t)) {}
-
-    T unwrap() {
-      return data_;
-    }
-
-    const T &unwrap() const {
-      return data_;
-    }
-
-    T &unwrap_mutable() {
-      return data_;
-    }
-
-    bool operator==(const Wrapper<T, Tag> &other) const {
-      return data_ == other.data_;
-    }
-
-   private:
-    T data_;
-  };
-
-  template <typename T,
-            typename Tag,
-            typename = std::enable_if<std::is_arithmetic<T>::value>>
-  bool operator<(const Wrapper<T, Tag> &a, const Wrapper<T, Tag> &b) {
-    return a.unwrap() < b.unwrap();
-  }
-
-}  // namespace sgns::common
-
-template <typename T, typename Tag>
-struct std::hash<sgns::common::Wrapper<T, Tag>> {
-  std::size_t operator()(const sgns::common::Wrapper<T, Tag> &w) {
-    return std::hash<T>()(w.unwrap());
-  }
-};
-
-#endif  // CPP_IPFS_LITE_COMMON_WRAPPER_HPP
diff --git a/test/core/common/outcome_test.cpp b/test/core/common/outcome_test.cpp
index 42b7153..837db7d 100644
--- a/test/core/common/outcome_test.cpp
+++ b/test/core/common/outcome_test.cpp
@@ -2,7 +2,6 @@
 #include "common/outcome.hpp"
 
 #include <gtest/gtest.h>
-#include "common/todo_error.hpp"
 
 namespace sgns {
 
@@ -12,18 +11,10 @@ namespace sgns {
     return IPFS::outcome::success();
   }
 
-  IPFS::outcome::result<void> funcFailure() {
-    return TodoError::ERROR;
-  }
-
   IPFS::outcome::result<int> funcSuccessReturn() {
     return ret;
   }
 
-  IPFS::outcome::result<int> funcFailureReturn() {
-    return TodoError::ERROR;
-  }
-
   /**
    * No throw on success result with no value
    */
@@ -31,13 +22,6 @@ namespace sgns {
     EXPECT_NO_THROW(_OUTCOME_EXCEPT_1(_UNIQUE_NAME(_r), funcSuccess()));
   }
 
-  /**
-   * Throw on failure result with no value
-   */
-  TEST(OutcomeExcept, OneArgExcept) {
-    EXPECT_THROW(_OUTCOME_EXCEPT_1(_UNIQUE_NAME(_r), funcFailure()), std::system_error);
-  }
-
   /**
    * No throw on success result with value returned
    */
@@ -46,11 +30,4 @@ namespace sgns {
     EXPECT_EQ(res, ret);
   }
 
-  /**
-   * Throw on failure result with value returned
-   */
-  TEST(OutcomeExcept, ValueReturnedExcept) {
-    EXPECT_THROW(_OUTCOME_EXCEPT_2(_UNIQUE_NAME(_r), res, funcFailureReturn()), std::system_error);
-  }
-
 }  // namespace sgns
diff --git a/test/testutil/outcome.hpp b/test/testutil/outcome.hpp
index 40e9704..8f4326c 100644
--- a/test/testutil/outcome.hpp
+++ b/test/testutil/outcome.hpp
@@ -4,7 +4,6 @@
 
 #include <gtest/gtest.h>
 #include "common/outcome.hpp"
-#include "common/visitor.hpp"
 
 #define PP_CAT(a, b) PP_CAT_I(a, b)
 #define PP_CAT_I(a, b) PP_CAT_II(~, a##b)

From f505673ca5e37279a6422d44929c15711df8770d Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Mon, 19 May 2025 13:19:42 -0300
Subject: [PATCH 05/17] Removed unused blake2s hash

---
 crypto/blake2/CMakeLists.txt     |   1 -
 crypto/blake2/blake2s.c          | 209 -------------------------------
 crypto/blake2/blake2s.h          |  76 -----------
 test/core/crypto/blake2_test.cpp |  60 ---------
 4 files changed, 346 deletions(-)
 delete mode 100644 crypto/blake2/blake2s.c
 delete mode 100644 crypto/blake2/blake2s.h

diff --git a/crypto/blake2/CMakeLists.txt b/crypto/blake2/CMakeLists.txt
index 2cc38b5..04fbd89 100644
--- a/crypto/blake2/CMakeLists.txt
+++ b/crypto/blake2/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_library(blake2
-    blake2s.c
     blake2b.c
     blake2b160.cpp
     )
diff --git a/crypto/blake2/blake2s.c b/crypto/blake2/blake2s.c
deleted file mode 100644
index a28894d..0000000
--- a/crypto/blake2/blake2s.c
+++ /dev/null
@@ -1,209 +0,0 @@
-
-// blake2s.c
-// A simple blake2s Reference Implementation.
-
-#include "blake2s.h"
-
-#include <stdint.h>
-
-#define _256_bits 32
-
-// Cyclic right rotation.
-
-#ifndef ROTR32
-#define ROTR32(x, y) (((x) >> (y)) ^ ((x) << (32 - (y))))
-#endif
-
-// Little-endian byte access.
-
-// state context
-typedef struct {
-  uint8_t b[64];  // input buffer
-  uint32_t h[8];  // chained state
-  uint32_t t[2];  // total number of bytes
-  size_t c;       // pointer for b[]
-  size_t outlen;  // digest size
-} blake2s_ctx_full;
-
-#define B2S_GET32(p)                                                        \
-  (((uint32_t)((uint8_t *)(p))[0]) ^ (((uint32_t)((uint8_t *)(p))[1]) << 8) \
-   ^ (((uint32_t)((uint8_t *)(p))[2]) << 16)                                \
-   ^ (((uint32_t)((uint8_t *)(p))[3]) << 24))
-
-// Mixing function G.
-
-#define B2S_G(a, b, c, d, x, y)     \
-  {                                 \
-    v[a] = v[a] + v[b] + (x);       \
-    v[d] = ROTR32(v[d] ^ v[a], 16); \
-    v[c] = v[c] + v[d];             \
-    v[b] = ROTR32(v[b] ^ v[c], 12); \
-    v[a] = v[a] + v[b] + (y);       \
-    v[d] = ROTR32(v[d] ^ v[a], 8);  \
-    v[c] = v[c] + v[d];             \
-    v[b] = ROTR32(v[b] ^ v[c], 7);  \
-  }
-
-// Initialization Vector.
-
-static const uint32_t blake2s_iv[8] = {0x6A09E667,
-                                       0xBB67AE85,
-                                       0x3C6EF372,
-                                       0xA54FF53A,
-                                       0x510E527F,
-                                       0x9B05688C,
-                                       0x1F83D9AB,
-                                       0x5BE0CD19};
-
-// Compression function. "last" flag indicates last block.
-
-static void blake2s_compress(blake2s_ctx_full *ctx, int last) {
-  const uint8_t sigma[10][16] = {
-      {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
-      {14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3},
-      {11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4},
-      {7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8},
-      {9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13},
-      {2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9},
-      {12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11},
-      {13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10},
-      {6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5},
-      {10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0}};
-  int i;
-  uint32_t v[16];
-  uint32_t m[16];
-
-  for (i = 0; i < 8; i++) {  // init work variables
-    v[i] = ctx->h[i];
-    v[i + 8] = blake2s_iv[i];
-  }
-
-  v[12] ^= ctx->t[0];  // low 32 bits of offset
-  v[13] ^= ctx->t[1];  // high 32 bits
-  if (last) {          // last block flag set ?
-    v[14] = ~v[14];
-  }
-
-  for (i = 0; i < 16; i++) {  // get little-endian words
-    m[i] = B2S_GET32(&ctx->b[4 * i]);
-  }
-
-  for (i = 0; i < 10; i++) {  // ten rounds
-    B2S_G(0, 4, 8, 12, m[sigma[i][0]], m[sigma[i][1]]);
-    B2S_G(1, 5, 9, 13, m[sigma[i][2]], m[sigma[i][3]]);
-    B2S_G(2, 6, 10, 14, m[sigma[i][4]], m[sigma[i][5]]);
-    B2S_G(3, 7, 11, 15, m[sigma[i][6]], m[sigma[i][7]]);
-    B2S_G(0, 5, 10, 15, m[sigma[i][8]], m[sigma[i][9]]);
-    B2S_G(1, 6, 11, 12, m[sigma[i][10]], m[sigma[i][11]]);
-    B2S_G(2, 7, 8, 13, m[sigma[i][12]], m[sigma[i][13]]);
-    B2S_G(3, 4, 9, 14, m[sigma[i][14]], m[sigma[i][15]]);
-  }
-
-  for (i = 0; i < 8; ++i) {
-    ctx->h[i] ^= v[i] ^ v[i + 8];
-  }
-}
-
-// Add "inlen" bytes from "in" into the hash.
-void blake2s_update(blake2s_ctx *ctx_opaque, const void *in, size_t inlen) {
-  blake2s_ctx_full *ctx = (blake2s_ctx_full *)ctx_opaque->opaque;
-
-  size_t i;
-
-  for (i = 0; i < inlen; i++) {
-    if (ctx->c == 64) {          // buffer full ?
-      ctx->t[0] += ctx->c;       // add counters
-      if (ctx->t[0] < ctx->c) {  // carry overflow ?
-        ctx->t[1]++;             // high word
-      }
-      blake2s_compress(ctx, 0);  // compress (not last)
-      ctx->c = 0;                // counter to zero
-    }
-    ctx->b[ctx->c++] = ((const uint8_t *)in)[i];
-  }
-}
-
-// Generate the message digest (size given in init).
-//      Result placed in "out".
-
-void blake2s_final(blake2s_ctx *ctx_opaque, void *out) {
-  blake2s_ctx_full *ctx = (blake2s_ctx_full *)ctx_opaque->opaque;
-
-  size_t i;
-
-  ctx->t[0] += ctx->c;       // mark last block offset
-  if (ctx->t[0] < ctx->c) {  // carry overflow
-    ctx->t[1]++;             // high word
-  }
-
-  while (ctx->c < 64) {  // fill up with zeros
-    ctx->b[ctx->c++] = 0;
-  }
-  blake2s_compress(ctx, 1);  // final block flag = 1
-
-  // little endian convert and store
-  for (i = 0; i < ctx->outlen; i++) {
-    ((uint8_t *)out)[i] = (uint8_t)((ctx->h[i >> 2] >> (8 * (i & 3))) & 0xFF);
-  }
-}
-
-int blake2s_init(blake2s_ctx *ctx_opaque,
-                 size_t outlen,
-                 const void *key,
-                 size_t keylen) {
-  blake2s_ctx_full *ctx = (blake2s_ctx_full *)ctx_opaque->opaque;
-
-  size_t i;
-
-  if (outlen == 0 || outlen > 32 || keylen > 32) {
-    return -1;  // illegal parameters
-  }
-
-  for (i = 0; i < 8; i++) {  // state, "param block"
-    ctx->h[i] = blake2s_iv[i];
-  }
-
-  ctx->h[0] ^= 0x01010000 ^ (keylen << 8) ^ outlen;
-
-  ctx->t[0] = 0;  // input count low word
-  ctx->t[1] = 0;  // input count high word
-  ctx->c = 0;     // pointer within buffer
-  ctx->outlen = outlen;
-
-  for (i = keylen; i < 64; i++) {  // zero input block
-    ctx->b[i] = 0;
-  }
-
-  if (keylen > 0) {
-    blake2s_update(ctx_opaque, key, keylen);
-    ctx->c = 64;  // at the end
-  }
-
-  return 0;
-}
-
-int blake2s(void *out,
-            size_t outlen,
-            const void *key,
-            size_t keylen,
-            const void *in,
-            size_t inlen) {
-  blake2s_ctx ctx;
-
-  if (blake2s_init(&ctx, outlen, key, keylen)) {
-    return -1;
-  }
-
-  blake2s_update(&ctx, in, inlen);
-  blake2s_final(&ctx, out);
-
-  return 0;
-}
-
-void blake2s_256_init(blake2s_ctx *ctx_opaque) {
-  blake2s_init(ctx_opaque, _256_bits, NULL, 0);
-}
-
-void blake2s_256(void *out, const void *in, size_t inlen) {
-  blake2s(out, _256_bits, NULL, 0, in, inlen);
-}
\ No newline at end of file
diff --git a/crypto/blake2/blake2s.h b/crypto/blake2/blake2s.h
deleted file mode 100644
index ee091b7..0000000
--- a/crypto/blake2/blake2s.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-#ifndef CORE_BLAKE2S_HASH
-#define CORE_BLAKE2S_HASH
-
-#include <stdlib.h>
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-typedef struct {
-  unsigned char opaque[128];
-} blake2s_ctx;
-
-/**
- * @brief Initialize hash context
- * @param ctx context
- */
-void blake2s_256_init(blake2s_ctx *ctx);
-
-/**
- * @brief Update context with incoming bytes
- * @param ctx context
- * @param in {@param inlen} byte array
- * @param inlen size of {@param in}
- */
-void blake2s_update(blake2s_ctx *ctx, const void *in, size_t inlen);
-
-/**
- * @brief Finalize hash calculation
- * @param ctx context
- * @param out 32-byte output
- * @return
- */
-void blake2s_final(blake2s_ctx *ctx, void *out);
-
-/**
- * @brief One-shot convenience function to calculate blake2s_256 hash
- * @param out 32-byte buffer
- * @param in {@param inlen} bytes input buffer
- * @param inlen size of the input buffer
- * @return
- */
-void blake2s_256(void *out, const void *in, size_t inlen);
-
-/**
- * @brief Generic blake2s init function
- * @param ctx context
- * @param outlen 1..32 bytes of output buffer size
- * @param key optional key
- * @param keylen length of {@param key} in bytes. Pass 0 to indicate that key is
- * not provided.
- * @return -1 in case of wrong input arguments; 0 in case of success.
- */
-int blake2s_init(blake2s_ctx *ctx, size_t outlen, const void *key,
-                 size_t keylen);
-
-/**
- * @brief All in one blake2s hashing function.
- * @param out output buffer
- * @param outlen size of {@param out}
- * @param key optional key
- * @param keylen size of {@param key}. Pass 0 to indicate that key is not
- * provided.
- * @param in data to be hashed
- * @param inlen size of {@param in}
- * @return -1 in case of wrong input arguments; 0 in case of success
- */
-int blake2s(void *out, size_t outlen, const void *key, size_t keylen,
-            const void *in, size_t inlen);
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif  // CORE_BLAKE2S_HASH
diff --git a/test/core/crypto/blake2_test.cpp b/test/core/crypto/blake2_test.cpp
index ef3bc3d..dced955 100644
--- a/test/core/crypto/blake2_test.cpp
+++ b/test/core/crypto/blake2_test.cpp
@@ -4,7 +4,6 @@
 #include <stdio.h>
 
 #include "crypto/blake2/blake2b.h"
-#include "crypto/blake2/blake2s.h"
 #include "testutil/literals.hpp"
 
 // Deterministic sequences (Fibonacci generator).
@@ -61,62 +60,3 @@ TEST(Blake2b, Correctness) {
 
   EXPECT_EQ(memcmp(md, blake2b_res.data(), 32), 0) << "hashes are different";
 }
-
-TEST(Blake2s, Correctness) {
-  // Grand hash of hash results.
-  auto blake2s_res =
-      "6A411F08CE25ADCDFB02ABA641451CEC53C598B24F4FC787FBDC88797F4C1DFE"_unhex;
-  // Parameter sets.
-  const size_t b2s_md_len[4] = {16, 20, 28, 32};
-  const size_t b2s_in_len[6] = {0, 3, 64, 65, 255, 1024};
-
-  size_t i, j, outlen, inlen;
-  uint8_t in[1024], md[32], key[32];
-  blake2s_ctx ctx;
-
-  // 256-bit hash for testing.
-  if (blake2s_init(&ctx, 32, nullptr, 0)) {
-    FAIL() << "Can not init";
-  }
-
-  for (i = 0; i < 4; i++) {
-    outlen = b2s_md_len[i];
-    for (j = 0; j < 6; j++) {
-      inlen = b2s_in_len[j];
-
-      selftest_seq(in, inlen, inlen);  // unkeyed hash
-      blake2s(md, outlen, nullptr, 0, in, inlen);
-      blake2s_update(&ctx, md, outlen);  // hash the hash
-
-      selftest_seq(key, outlen, outlen);  // keyed hash
-      blake2s(md, outlen, key, outlen, in, inlen);
-      blake2s_update(&ctx, md, outlen);  // hash the hash
-    }
-  }
-
-  // Compute and compare the hash of hashes.
-  blake2s_final(&ctx, md);
-
-  EXPECT_EQ(memcmp(md, blake2s_res.data(), 32), 0) << "hashes are different";
-}
-
-TEST(Blake2s, UnkeyedInit) {
-  blake2s_ctx ctx1, ctx2;
-
-  blake2s_init(&ctx1, 32, nullptr, 0);
-  blake2s_256_init(&ctx2);
-
-  const char *in = "hello";
-  size_t len = 5;
-
-  unsigned char out1[32];
-  unsigned char out2[32];
-
-  blake2s_update(&ctx1, in, len);
-  blake2s_update(&ctx2, in, len);
-
-  blake2s_final(&ctx1, out1);
-  blake2s_final(&ctx2, out2);
-
-  EXPECT_EQ(memcmp(out1, out2, 32), 0) << "hashes are different";
-}

From 39514c5b4c86e036d290ed8532a87a3f98b8edb5 Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Tue, 20 May 2025 10:06:36 -0300
Subject: [PATCH 06/17] Simplified API

---
 codec/uvarint.hpp                           |  6 ++---
 ipfs_lite/ipfs/graphsync/extension.hpp      |  6 -----
 ipfs_lite/ipfs/graphsync/impl/common.hpp    |  2 +-
 ipfs_lite/ipfs/graphsync/impl/extension.cpp | 28 ++-------------------
 4 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/codec/uvarint.hpp b/codec/uvarint.hpp
index b1cceea..41f87da 100644
--- a/codec/uvarint.hpp
+++ b/codec/uvarint.hpp
@@ -7,10 +7,8 @@
 #include "common/outcome.hpp"
 
 namespace sgns::codec::uvarint {
-  using Input = gsl::span<const uint8_t>;
-
   template <auto error, typename T = uint64_t>
-  IPFS::outcome::result<T> read(Input &input) {
+  IPFS::outcome::result<T> read(gsl::span<const uint8_t> &input) {
     auto value = libp2p::multi::UVarint::create(input);
     if (!value) {
       return error;
@@ -20,7 +18,7 @@ namespace sgns::codec::uvarint {
   }
 
   template <auto error_length, auto error_data>
-  IPFS::outcome::result<Input> readBytes(Input &input) {
+  IPFS::outcome::result<gsl::span<const uint8_t>> readBytes(gsl::span<const uint8_t> &input) {
     OUTCOME_TRY((auto &&, size), read<error_length>(input));
     if (input.size() < static_cast<ptrdiff_t>(size)) {
       return error_data;
diff --git a/ipfs_lite/ipfs/graphsync/extension.hpp b/ipfs_lite/ipfs/graphsync/extension.hpp
index ac490f6..b3628c2 100644
--- a/ipfs_lite/ipfs/graphsync/extension.hpp
+++ b/ipfs_lite/ipfs/graphsync/extension.hpp
@@ -26,9 +26,6 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
     }
   };
 
-  /// Returns "graphsync/response-metadata":true extension
-  Extension encodeMetadataRequest();
-
   /// Response metadata indicates whether the responder has certain CIDs
   using ResponseMetadata = std::vector<std::pair<CID, bool>>;
 
@@ -42,9 +39,6 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
   /// Encodes CIDS for "graphsync/do-not-send-cids" extension
   Extension encodeDontSendCids(const std::vector<CID> &dont_send_cids);
 
-  /// Decodes CID subset not to be included into response
-  IPFS::outcome::result<std::set<CID>> decodeDontSendCids(const Extension &extension);
-
 }  // namespace sgns::ipfs_lite::ipfs::graphsync
 
 #endif  // CPP_IPFS_LITE_GRAPHSYNC_EXTENSION_HPP
diff --git a/ipfs_lite/ipfs/graphsync/impl/common.hpp b/ipfs_lite/ipfs/graphsync/impl/common.hpp
index 65a293a..6dbed03 100644
--- a/ipfs_lite/ipfs/graphsync/impl/common.hpp
+++ b/ipfs_lite/ipfs/graphsync/impl/common.hpp
@@ -2,9 +2,9 @@
 #ifndef CPP_IPFS_LITE_GRAPHSYNC_COMMON_HPP
 #define CPP_IPFS_LITE_GRAPHSYNC_COMMON_HPP
 
-// #include "common/logger.hpp"
 #include "ipfs_lite/ipfs/graphsync/graphsync.hpp"
 #include "common/logger.hpp"
+
 namespace sgns::ipfs_lite::ipfs::graphsync {
 
   /// Graphsync internal error codes
diff --git a/ipfs_lite/ipfs/graphsync/impl/extension.cpp b/ipfs_lite/ipfs/graphsync/impl/extension.cpp
index d6e7084..4716009 100644
--- a/ipfs_lite/ipfs/graphsync/impl/extension.cpp
+++ b/ipfs_lite/ipfs/graphsync/impl/extension.cpp
@@ -49,12 +49,6 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
 
   }  // namespace
 
-  Extension encodeMetadataRequest() {
-    static const Extension e = {std::string(kResponseMetadataProtocol),
-                                std::vector<uint8_t>{0xF5}};
-    return e;
-  }
-
   Extension encodeResponseMetadata(const ResponseMetadata &metadata) {
     Extension e;
     e.name = kResponseMetadataProtocol;
@@ -64,7 +58,7 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
     }
     CborEncodeStream encoder;
     encoder << l;
-    e.data = encoder.data();
+    e.data = std::move(encoder.data());
     return e;
   }
 
@@ -119,7 +113,7 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
 
         OUTCOME_TRY((auto &&, present), decodeBool(present_p->second.raw()));
 
-        pairs.push_back({std::move(cid), present});
+        pairs.emplace_back(std::move(cid), present);
       }
     } catch (const std::exception &e) {
       logger()->warn("{}: {}", __FUNCTION__, e.what());
@@ -138,22 +132,4 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
     return e;
   }
 
-  IPFS::outcome::result<std::set<CID>> decodeDontSendCids(
-      const Extension &extension) {
-    if (extension.name != kDontSendCidsProtocol) {
-      return Error::MESSAGE_PARSE_ERROR;
-    }
-
-    std::vector<CID> cids;
-    try {
-      CborDecodeStream decoder(extension.data);
-      decoder >> cids;
-    } catch (const std::exception &e) {
-      logger()->warn("{}: {}", __FUNCTION__, e.what());
-      return Error::MESSAGE_PARSE_ERROR;
-    }
-    return std::set<CID>(std::move_iterator(cids.begin()),
-                         std::move_iterator(cids.end()));
-  }
-
 }  // namespace sgns::ipfs_lite::ipfs::graphsync

From deddd015d11a883f31dc548ac0041f8f6be477dc Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Tue, 20 May 2025 10:06:52 -0300
Subject: [PATCH 07/17] Removed leaf abstraction

---
 common/hexutil.hpp                            |  5 --
 ipfs_lite/ipfs/merkledag/CMakeLists.txt       |  2 +-
 ipfs_lite/ipfs/merkledag/impl/leaf_impl.cpp   | 51 -------------
 ipfs_lite/ipfs/merkledag/impl/leaf_impl.hpp   | 41 ----------
 .../merkledag/impl/merkledag_service_impl.cpp |  6 +-
 .../merkledag/impl/merkledag_service_impl.hpp |  4 +-
 ipfs_lite/ipfs/merkledag/leaf.cpp             | 12 +++
 ipfs_lite/ipfs/merkledag/leaf.hpp             | 75 +++++++++++++++----
 primitives/cid/cid.cpp                        |  2 +
 9 files changed, 81 insertions(+), 117 deletions(-)
 delete mode 100644 ipfs_lite/ipfs/merkledag/impl/leaf_impl.cpp
 delete mode 100644 ipfs_lite/ipfs/merkledag/impl/leaf_impl.hpp
 create mode 100644 ipfs_lite/ipfs/merkledag/leaf.cpp

diff --git a/common/hexutil.hpp b/common/hexutil.hpp
index c556eb7..e26480e 100644
--- a/common/hexutil.hpp
+++ b/common/hexutil.hpp
@@ -14,11 +14,6 @@ namespace sgns::common {
    */
   enum class UnhexError { NOT_ENOUGH_INPUT = 1, NON_HEX_INPUT, UNKNOWN };
 
-  /**
-   * @brief Converts an integer to an uppercase hex representation
-   */
-  std::string int_to_hex(uint64_t n, size_t fixed_width = 2) noexcept;
-
   /**
    * @brief Converts bytes to uppercase hex representation
    * @param array bytes
diff --git a/ipfs_lite/ipfs/merkledag/CMakeLists.txt b/ipfs_lite/ipfs/merkledag/CMakeLists.txt
index 15e207a..95c0d0f 100644
--- a/ipfs_lite/ipfs/merkledag/CMakeLists.txt
+++ b/ipfs_lite/ipfs/merkledag/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_library(ipfs_merkledag_service
     impl/merkledag_service_impl.cpp
-    impl/leaf_impl.cpp
+    leaf.cpp
     )
 target_link_libraries(ipfs_merkledag_service
     graphsync
diff --git a/ipfs_lite/ipfs/merkledag/impl/leaf_impl.cpp b/ipfs_lite/ipfs/merkledag/impl/leaf_impl.cpp
deleted file mode 100644
index daaca37..0000000
--- a/ipfs_lite/ipfs/merkledag/impl/leaf_impl.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-
-#include "ipfs_lite/ipfs/merkledag/impl/leaf_impl.hpp"
-
-namespace sgns::ipfs_lite::ipfs::merkledag {
-  LeafImpl::LeafImpl(common::Buffer data)
-      : content_{std::move(data)} {}
-
-  const common::Buffer &LeafImpl::content() const {
-    return content_;
-  }
-
-  size_t LeafImpl::count() const {
-    return children_.size();
-  }
-
-  IPFS::outcome::result<std::reference_wrapper<const Leaf>> LeafImpl::subLeaf(
-      std::string_view name) const {
-    if (auto iter = children_.find(name); iter != children_.end()) {
-      return iter->second;
-    }
-    return LeafError::LEAF_NOT_FOUND;
-  }
-
-  std::vector<std::string_view> LeafImpl::getSubLeafNames() const {
-    std::vector<std::string_view> names;
-    for (const auto &child : children_) {
-      names.push_back(child.first);
-    }
-    return names;
-  }
-
-  IPFS::outcome::result<void> LeafImpl::insertSubLeaf(std::string name,
-                                                 LeafImpl children) {
-    auto result = children_.emplace(std::move(name), std::move(children));
-    if (result.second) {
-      return IPFS::outcome::success();
-    }
-    return LeafError::DUPLICATE_LEAF;
-  }
-}  // namespace sgns::ipfs_lite::ipfs::merkledag
-
-OUTCOME_CPP_DEFINE_CATEGORY_3(sgns::ipfs_lite::ipfs::merkledag, LeafError, e) {
-  using sgns::ipfs_lite::ipfs::merkledag::LeafError;
-  switch (e) {
-    case (LeafError::LEAF_NOT_FOUND):
-      return "MerkleDAG leaf: children leaf not found";
-    case (LeafError::DUPLICATE_LEAF):
-      return "MerkleDAG leaf: duplicate leaf name";
-  }
-  return "MerkleDAG leaf: unknown error";
-}
diff --git a/ipfs_lite/ipfs/merkledag/impl/leaf_impl.hpp b/ipfs_lite/ipfs/merkledag/impl/leaf_impl.hpp
deleted file mode 100644
index 88e874e..0000000
--- a/ipfs_lite/ipfs/merkledag/impl/leaf_impl.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef CPP_IPFS_LITE_IPFS_MERKLEDAG_LEAF_IMPL_HPP
-#define CPP_IPFS_LITE_IPFS_MERKLEDAG_LEAF_IMPL_HPP
-
-#include "ipfs_lite/ipfs/merkledag/leaf.hpp"
-
-#include <map>
-#include <string>
-
-namespace sgns::ipfs_lite::ipfs::merkledag {
-  class LeafImpl : public Leaf {
-   public:
-    /**
-     * @brief Construct leaf
-     * @param data - leaf content
-     */
-    explicit LeafImpl(common::Buffer data);
-
-    const common::Buffer &content() const override;
-
-    size_t count() const override;
-
-    IPFS::outcome::result<std::reference_wrapper<const Leaf>> subLeaf(
-        std::string_view name) const override;
-
-    std::vector<std::string_view> getSubLeafNames() const override;
-
-    /**
-     * @brief Insert children leaf
-     * @param name - id of the leaf
-     * @param children - leaf to insert
-     * @return operation result
-     */
-    IPFS::outcome::result<void> insertSubLeaf(std::string name, LeafImpl children);
-
-   private:
-    common::Buffer content_;
-    std::map<std::string, LeafImpl, std::less<>> children_;
-  };
-}  // namespace sgns::ipfs_lite::ipfs::merkledag
-
-#endif
diff --git a/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.cpp b/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.cpp
index 203d867..703f527 100644
--- a/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.cpp
+++ b/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.cpp
@@ -69,7 +69,7 @@ namespace sgns::ipfs_lite::ipfs::merkledag {
       const CID& cid, std::optional<uint64_t> depth)
   {
       OUTCOME_TRY((auto &&, node), nodeGetter(cid));
-      auto leaf = std::make_shared<LeafImpl>(node->content());
+      auto leaf = std::make_shared<Leaf>(node->content());
       auto result = buildGraph(nodeGetter, leaf, node->getLinks(), depth, 0);
       if (result.has_error()) return result.error();
       return leaf;
@@ -77,7 +77,7 @@ namespace sgns::ipfs_lite::ipfs::merkledag {
 
   IPFS::outcome::result<void> MerkleDagServiceImpl::buildGraph(
       std::function<IPFS::outcome::result<std::shared_ptr<IPLDNode>>(const CID& cid)> nodeGetter,
-      const std::shared_ptr<LeafImpl> &root,
+      const std::shared_ptr<Leaf> &root,
       const std::vector<std::reference_wrapper<const IPLDLink>> &links,
       std::optional<size_t> max_depth,
       size_t current_depth) {
@@ -88,7 +88,7 @@ namespace sgns::ipfs_lite::ipfs::merkledag {
       auto request = nodeGetter(link.get().getCID());
       if (request.has_error()) return ServiceError::UNRESOLVED_LINK;
       std::shared_ptr<IPLDNode> node = request.value();
-      auto child_leaf = std::make_shared<LeafImpl>(node->content());
+      auto child_leaf = std::make_shared<Leaf>(node->content());
       auto build_result = buildGraph(nodeGetter,
                                      child_leaf,
                                      node->getLinks(),
diff --git a/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.hpp b/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.hpp
index 626576b..f5e3bae 100644
--- a/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.hpp
+++ b/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.hpp
@@ -4,7 +4,7 @@
 #include <memory>
 
 #include "ipfs_lite/ipfs/datastore.hpp"
-#include "ipfs_lite/ipfs/merkledag/impl/leaf_impl.hpp"
+#include "ipfs_lite/ipfs/merkledag/leaf.hpp"
 #include "ipfs_lite/ipfs/merkledag/merkledag_service.hpp"
 #include "ipfs_lite/ipld/ipld_link.hpp"
 
@@ -65,7 +65,7 @@ namespace sgns::ipfs_lite::ipfs::merkledag {
      */
     static IPFS::outcome::result<void> buildGraph(
         std::function<IPFS::outcome::result<std::shared_ptr<IPLDNode>>(const CID& cid)> nodeGetter,
-        const std::shared_ptr<LeafImpl> &root,
+        const std::shared_ptr<Leaf> &root,
         const std::vector<std::reference_wrapper<const IPLDLink>> &links,
         std::optional<size_t> max_depth,
         size_t current_depth = 0);
diff --git a/ipfs_lite/ipfs/merkledag/leaf.cpp b/ipfs_lite/ipfs/merkledag/leaf.cpp
new file mode 100644
index 0000000..de871f1
--- /dev/null
+++ b/ipfs_lite/ipfs/merkledag/leaf.cpp
@@ -0,0 +1,12 @@
+#include "leaf.hpp"
+
+OUTCOME_CPP_DEFINE_CATEGORY_3(sgns::ipfs_lite::ipfs::merkledag, LeafError, e) {
+    using sgns::ipfs_lite::ipfs::merkledag::LeafError;
+    switch (e) {
+        case (LeafError::LEAF_NOT_FOUND):
+            return "MerkleDAG leaf: children leaf not found";
+        case (LeafError::DUPLICATE_LEAF):
+            return "MerkleDAG leaf: duplicate leaf name";
+    }
+    return "MerkleDAG leaf: unknown error";
+}
diff --git a/ipfs_lite/ipfs/merkledag/leaf.hpp b/ipfs_lite/ipfs/merkledag/leaf.hpp
index 30f26d0..f5aebf1 100644
--- a/ipfs_lite/ipfs/merkledag/leaf.hpp
+++ b/ipfs_lite/ipfs/merkledag/leaf.hpp
@@ -9,8 +9,27 @@
 #include "common/outcome.hpp"
 
 namespace sgns::ipfs_lite::ipfs::merkledag {
-  class Leaf {
-   public:
+
+/**
+   * @enum Possible leaf errors
+   */
+enum class LeafError : int {
+    LEAF_NOT_FOUND = 1,
+    DUPLICATE_LEAF
+};
+}
+
+OUTCOME_HPP_DECLARE_ERROR_2(sgns::ipfs_lite::ipfs::merkledag, LeafError)
+
+namespace sgns::ipfs_lite::ipfs::merkledag {
+class Leaf {
+  public:
+    /**
+     * @brief Construct leaf
+     * @param data - leaf content
+     */
+    explicit Leaf(common::Buffer data): content_(std::move(data)) {}
+
     /**
      * @brief Destructor
      */
@@ -20,35 +39,63 @@ namespace sgns::ipfs_lite::ipfs::merkledag {
      * @brief Get leaf content
      * @return operation result
      */
-    virtual const common::Buffer &content() const = 0;
+    [[nodiscard]] const common::Buffer& content() const {
+        return content_;
+    }
 
     /**
      * @brief Get count of children leaves
      * @return Count of leaves
      */
-    virtual size_t count() const = 0;
+    [[nodiscard]] size_t count() const {
+        return children_.size();
+    }
 
     /**
      * @brief Get children leaf
      * @param name - leaf name
      * @return operation result
      */
-    virtual IPFS::outcome::result<std::reference_wrapper<const Leaf>> subLeaf(
-        std::string_view name) const = 0;
+    [[nodiscard]] IPFS::outcome::result<std::reference_wrapper<const Leaf>> subLeaf(
+        std::string_view name
+    ) const {
+
+        if (auto iter = children_.find(name); iter != children_.end()) {
+            return iter->second;
+        }
+        return LeafError::LEAF_NOT_FOUND;
+    }
 
     /**
      * @brief Get names of all sub leaves of the current leaf
      * @return operation result
      */
-    virtual std::vector<std::string_view> getSubLeafNames() const = 0;
-  };
+    [[nodiscard]] std::vector<std::string_view> getSubLeafNames() const {
+        std::vector<std::string_view> names;
+        for (const auto& child : children_) {
+            names.push_back(child.first);
+        }
+        return names;
+    }
 
-  /**
-   * @enum Possible leaf errors
-   */
-  enum class LeafError : int { LEAF_NOT_FOUND = 1, DUPLICATE_LEAF };
-}  // namespace sgns::ipfs_lite::ipfs::merkledag
+    /**
+     * @brief Insert children leaf
+     * @param name - id of the leaf
+     * @param children - leaf to insert
+     * @return operation result
+     */
+    IPFS::outcome::result<void> insertSubLeaf(std::string name, Leaf children) {
+        auto result = children_.emplace(std::move(name), std::move(children));
+        if (result.second) {
+            return IPFS::outcome::success();
+        }
+        return LeafError::DUPLICATE_LEAF;
+    }
 
-OUTCOME_HPP_DECLARE_ERROR_2(sgns::ipfs_lite::ipfs::merkledag, LeafError)
+  private:
+    common::Buffer content_;
+    std::map<std::string, Leaf, std::less<>> children_;
+};
+}  // namespace sgns::ipfs_lite::ipfs::merkledag
 
 #endif
diff --git a/primitives/cid/cid.cpp b/primitives/cid/cid.cpp
index dda85e9..01e485f 100644
--- a/primitives/cid/cid.cpp
+++ b/primitives/cid/cid.cpp
@@ -67,6 +67,7 @@ namespace sgns {
   IPFS::outcome::result<CID> CID::read(gsl::span<const uint8_t> &input, bool prefix) {
     using Error = libp2p::multi::ContentIdentifierCodec::DecodeError;
     CID cid;
+    
     if (input.size() >= 2 && HashType{input[0]} == HashType::sha256
         && input[1] == 32) {
       cid.version = Version::V0;
@@ -93,6 +94,7 @@ namespace sgns {
             input));
     OUTCOME_TRY((auto &&, hash_size),
                 codec::uvarint::read<Multihash::Error::INPUT_TOO_SHORT>(input));
+
     gsl::span<const uint8_t> hash_span;
     if (prefix) {
       static const uint8_t empty[Multihash::kMaxHashLength]{};

From 459bb9aff5fcfded1a567c07231d71f247d482d9 Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Wed, 21 May 2025 13:19:00 -0300
Subject: [PATCH 08/17] Removed `MerkleDagBridge` abstraction

---
 data_transfer/message.hpp                     |  4 +-
 ipfs_lite/ipfs/graphsync/graphsync.hpp        | 22 +++++-----
 ipfs_lite/ipfs/graphsync/impl/CMakeLists.txt  |  1 -
 .../ipfs/graphsync/impl/graphsync_impl.cpp    | 20 +++++++++
 .../graphsync/impl/merkledag_bridge_impl.cpp  | 41 -------------------
 .../graphsync/impl/merkledag_bridge_impl.hpp  | 30 --------------
 6 files changed, 34 insertions(+), 84 deletions(-)
 delete mode 100644 ipfs_lite/ipfs/graphsync/impl/merkledag_bridge_impl.cpp
 delete mode 100644 ipfs_lite/ipfs/graphsync/impl/merkledag_bridge_impl.hpp

diff --git a/data_transfer/message.hpp b/data_transfer/message.hpp
index 9e6f6fb..81117bf 100644
--- a/data_transfer/message.hpp
+++ b/data_transfer/message.hpp
@@ -21,7 +21,7 @@ namespace sgns::data_transfer {
     std::string voucher_type;
     TransferId transfer_id;
 
-    inline bool operator==(const DataTransferRequest &other) const {
+    bool operator==(const DataTransferRequest &other) const {
       return base_cid == other.base_cid && is_cancel == other.is_cancel
              && pid == other.pid && is_part == other.is_part
              && is_pull == other.is_pull && selector == other.selector
@@ -37,7 +37,7 @@ namespace sgns::data_transfer {
     bool is_accepted;
     TransferId transfer_id;
 
-    inline bool operator==(const DataTransferResponse &other) const {
+    bool operator==(const DataTransferResponse &other) const {
       return is_accepted == other.is_accepted
              && transfer_id == other.transfer_id;
     }
diff --git a/ipfs_lite/ipfs/graphsync/graphsync.hpp b/ipfs_lite/ipfs/graphsync/graphsync.hpp
index d3cb9d3..9fff876 100644
--- a/ipfs_lite/ipfs/graphsync/graphsync.hpp
+++ b/ipfs_lite/ipfs/graphsync/graphsync.hpp
@@ -12,6 +12,7 @@
 #include "common/buffer.hpp"
 #include "common/outcome.hpp"
 #include "ipfs_lite/ipfs/graphsync/extension.hpp"
+#include "ipfs_lite/ipfs/merkledag/merkledag_service.hpp"
 
 namespace sgns::ipfs_lite::ipfs::merkledag {
   class MerkleDagService;
@@ -23,13 +24,10 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
 
   /// Graphsync -> MerkleDagService bridge
   struct MerkleDagBridge {
-    /// Creates a default bridge
-    /// \param service Existing MerkleDAG service
-    /// \return Bridge object
-    static std::shared_ptr<MerkleDagBridge> create(
-        std::shared_ptr<merkledag::MerkleDagService> service);
+    MerkleDagBridge(std::shared_ptr<merkledag::MerkleDagService> service):
+        service_(std::move(service)) {}
 
-    virtual ~MerkleDagBridge() = default;
+    ~MerkleDagBridge() = default;
 
     /// Forwards select call to the service or other backend
     /// \param cid Root CID
@@ -37,11 +35,14 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
     /// \param handler Data handler, returns false if further search is no
     /// longer required
     /// \return Count of data blocks passed through handler or error
-    virtual IPFS::outcome::result<size_t> select(
-        const CID &cid,
+    IPFS::outcome::result<size_t> select(
+        const CID& cid,
         gsl::span<const uint8_t> selector,
-        std::function<bool(const CID &cid, const common::Buffer &data)> handler)
-        const = 0;
+        std::function<bool(const CID& cid, const common::Buffer& data)> handler
+    ) const;
+
+  private:
+    std::shared_ptr<merkledag::MerkleDagService> service_;
   };
 
   /// Response status codes. Positive values are received from wire,
@@ -102,6 +103,7 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
       COMPLETED,
       FAILED
     };
+
     virtual ~Graphsync() = default;
 
     /// New nodes received go through this callback
diff --git a/ipfs_lite/ipfs/graphsync/impl/CMakeLists.txt b/ipfs_lite/ipfs/graphsync/impl/CMakeLists.txt
index e440aee..7214eea 100644
--- a/ipfs_lite/ipfs/graphsync/impl/CMakeLists.txt
+++ b/ipfs_lite/ipfs/graphsync/impl/CMakeLists.txt
@@ -3,7 +3,6 @@ add_library(graphsync
     common.cpp
     extension.cpp
     graphsync_impl.cpp
-    merkledag_bridge_impl.cpp
     local_requests.cpp
     network/network.cpp
     network/peer_context.cpp
diff --git a/ipfs_lite/ipfs/graphsync/impl/graphsync_impl.cpp b/ipfs_lite/ipfs/graphsync/impl/graphsync_impl.cpp
index 7118911..51cfa4a 100644
--- a/ipfs_lite/ipfs/graphsync/impl/graphsync_impl.cpp
+++ b/ipfs_lite/ipfs/graphsync/impl/graphsync_impl.cpp
@@ -16,6 +16,26 @@ OUTCOME_CPP_DEFINE_CATEGORY_3( sgns::ipfs_lite::ipfs::graphsync, GraphsyncImpl::
     return "Unknown error";
 }
 namespace sgns::ipfs_lite::ipfs::graphsync {
+  IPFS::outcome::result<size_t> MerkleDagBridge::select(
+      const CID &root_cid,
+      gsl::span<const uint8_t> selector,
+      std::function<bool(const CID &, const common::Buffer &)> handler) const {
+    auto internal_handler =
+        [&handler](std::shared_ptr<const ipld::IPLDNode> node) -> bool {
+      return handler(node->getCID(), node->getRawBytes());
+    };
+
+    if (selector.empty()) {
+      OUTCOME_TRY((auto &&, node), service_->getNode(root_cid));
+      internal_handler(node);
+      return 1;
+    }
+
+    // TODO(???): change MerkleDAG service to accept CID instead of bytes
+    OUTCOME_TRY((auto &&, cid_encoded), root_cid.toBytes());
+    return service_->select(cid_encoded, selector, internal_handler);
+  }
+
   /// Selector that matches current node
   common::Buffer kSelectorMatcher{0xa1, 0x61, 0x2e, 0xa0};
 
diff --git a/ipfs_lite/ipfs/graphsync/impl/merkledag_bridge_impl.cpp b/ipfs_lite/ipfs/graphsync/impl/merkledag_bridge_impl.cpp
deleted file mode 100644
index 810510c..0000000
--- a/ipfs_lite/ipfs/graphsync/impl/merkledag_bridge_impl.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#include "merkledag_bridge_impl.hpp"
-
-#include <cassert>
-
-#include "ipfs_lite/ipfs/merkledag/merkledag_service.hpp"
-
-namespace sgns::ipfs_lite::ipfs::graphsync {
-
-  std::shared_ptr<MerkleDagBridge> MerkleDagBridge::create(
-      std::shared_ptr<merkledag::MerkleDagService> service) {
-    return std::make_shared<MerkleDagBridgeImpl>(std::move(service));
-  }
-
-  MerkleDagBridgeImpl::MerkleDagBridgeImpl(
-      std::shared_ptr<merkledag::MerkleDagService> service)
-      : service_(std::move(service)) {
-    assert(service_);
-  }
-
-  IPFS::outcome::result<size_t> MerkleDagBridgeImpl::select(
-      const CID &root_cid,
-      gsl::span<const uint8_t> selector,
-      std::function<bool(const CID &, const common::Buffer &)> handler) const {
-    auto internal_handler =
-        [&handler](std::shared_ptr<const ipld::IPLDNode> node) -> bool {
-      return handler(node->getCID(), node->getRawBytes());
-    };
-
-    if (selector.empty()) {
-      OUTCOME_TRY((auto &&, node), service_->getNode(root_cid));
-      internal_handler(node);
-      return 1;
-    }
-
-    // TODO(???): change MerkleDAG service to accept CID instead of bytes
-    OUTCOME_TRY((auto &&, cid_encoded), root_cid.toBytes());
-    return service_->select(cid_encoded, selector, internal_handler);
-  }
-
-}  // namespace sgns::ipfs_lite::ipfs::graphsync
diff --git a/ipfs_lite/ipfs/graphsync/impl/merkledag_bridge_impl.hpp b/ipfs_lite/ipfs/graphsync/impl/merkledag_bridge_impl.hpp
deleted file mode 100644
index 67c2cec..0000000
--- a/ipfs_lite/ipfs/graphsync/impl/merkledag_bridge_impl.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#ifndef CPP_IPFS_LITE_MERKLEDAG_BRIDGE_IMPL_HPP
-#define CPP_IPFS_LITE_MERKLEDAG_BRIDGE_IMPL_HPP
-
-#include "ipfs_lite/ipfs/graphsync/graphsync.hpp"
-
-namespace sgns::ipfs_lite::ipfs::graphsync {
-
-  /// Default implementation og Graphsync->MerkleDAG bridge
-  class MerkleDagBridgeImpl : public MerkleDagBridge {
-   public:
-    /// Ctor. called form  MerkleDagBridge::create(...)
-    explicit MerkleDagBridgeImpl(
-        std::shared_ptr<merkledag::MerkleDagService> service);
-
-   private:
-    // overrides MerkleDagBridge interface
-    IPFS::outcome::result<size_t> select(
-        const CID &root_cid,
-        gsl::span<const uint8_t> selector,
-        std::function<bool(const CID &cid, const common::Buffer &data)> handler)
-        const override;
-
-    /// MerkleDAG service
-    std::shared_ptr<merkledag::MerkleDagService> service_;
-  };
-
-}  // namespace ipfs_lite::ipfs_lite::ipfs::graphsync
-
-#endif  // CPP_IPFS_LITE_MERKLEDAG_BRIDGE_IMPL_HPP

From 5edba68edf5a4d2f9bcb1865d91f627e8de20c77 Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Wed, 21 May 2025 13:19:15 -0300
Subject: [PATCH 09/17] Removed `IPLDLink` abstraction

---
 CMakeLists.txt                                |   1 -
 ipfs_lite/ipld/CMakeLists.txt                 |   9 --
 ipfs_lite/ipld/impl/ipld_link_impl.cpp        |  19 ---
 ipfs_lite/ipld/impl/ipld_link_impl.hpp        |  36 -----
 ipfs_lite/ipld/impl/ipld_node_encoder_pb.cpp  | 125 ++++++++++--------
 ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp  |  13 +-
 ipfs_lite/ipld/impl/ipld_node_impl.cpp        |  19 +--
 ipfs_lite/ipld/impl/ipld_node_impl.hpp        |   9 +-
 ipfs_lite/ipld/ipld_link.hpp                  |  35 ++++-
 ipfs_lite/ipld/ipld_node.hpp                  |   4 +-
 primitives/cid/json_codec.cpp                 |   6 +-
 .../merkledag/ipfs_merkledag_service_test.cpp |  21 ++-
 12 files changed, 127 insertions(+), 170 deletions(-)
 delete mode 100644 ipfs_lite/ipld/impl/ipld_link_impl.cpp
 delete mode 100644 ipfs_lite/ipld/impl/ipld_link_impl.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6780e1a..429da5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,6 @@ install(TARGETS ipfs_blockservice
     buffer rocksdb_wrapper cid ipld_node cbor ipfs_lite_hasher logger
     hexutil
     blake2
-    ipld_link
     outcome
     tinycbor
     ipld_block
diff --git a/ipfs_lite/ipld/CMakeLists.txt b/ipfs_lite/ipld/CMakeLists.txt
index bae35d7..b430204 100644
--- a/ipfs_lite/ipld/CMakeLists.txt
+++ b/ipfs_lite/ipld/CMakeLists.txt
@@ -7,14 +7,6 @@ target_link_libraries(ipld_block INTERFACE
     ipfs_lite_hasher
     )
 
-add_library(ipld_link
-    impl/ipld_link_impl.cpp
-    )
-
-target_link_libraries(ipld_link
-    cid
-    )
-
 add_library(ipld_node
     impl/ipld_node_impl.cpp
     impl/ipld_node_encoder_pb.cpp
@@ -23,7 +15,6 @@ add_library(ipld_node
 
 target_link_libraries(ipld_node
     ipld_node_protobuf
-    ipld_link
     ipld_block
     Boost::boost
     cid
diff --git a/ipfs_lite/ipld/impl/ipld_link_impl.cpp b/ipfs_lite/ipld/impl/ipld_link_impl.cpp
deleted file mode 100644
index 1166da0..0000000
--- a/ipfs_lite/ipld/impl/ipld_link_impl.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#include "ipfs_lite/ipld/impl/ipld_link_impl.hpp"
-
-namespace sgns::ipfs_lite::ipld {
-  IPLDLinkImpl::IPLDLinkImpl(CID id, std::string name, size_t size)
-      : cid_{std::move(id)}, name_{std::move(name)}, size_{size} {}
-
-  const std::string &IPLDLinkImpl::getName() const {
-    return name_;
-  }
-
-  const CID &IPLDLinkImpl::getCID() const {
-    return cid_;
-  }
-
-  size_t IPLDLinkImpl::getSize() const {
-    return size_;
-  }
-}  // namespace sgns::ipfs_lite::ipld
diff --git a/ipfs_lite/ipld/impl/ipld_link_impl.hpp b/ipfs_lite/ipld/impl/ipld_link_impl.hpp
deleted file mode 100644
index a7b0977..0000000
--- a/ipfs_lite/ipld/impl/ipld_link_impl.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef IPFS_LITE_IPLD_LINK_IMPL_HPP
-#define IPFS_LITE_IPLD_LINK_IMPL_HPP
-
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "ipfs_lite/ipld/ipld_link.hpp"
-
-namespace sgns::ipfs_lite::ipld {
-  class IPLDLinkImpl : public IPLDLink {
-   public:
-    /**
-     * @brief Construct Link
-     * @param id - CID of the target object
-     * @param name - name of the target object
-     * @param size - total size of the target object
-     */
-    IPLDLinkImpl(CID id, std::string name, size_t size);
-
-    IPLDLinkImpl() = default;
-
-    const std::string &getName() const override;
-
-    const CID &getCID() const override;
-
-    size_t getSize() const override;
-
-   private:
-    CID cid_;
-    std::string name_;
-    size_t size_{};
-  };
-}  // namespace sgns::ipfs_lite::ipld
-
-#endif
diff --git a/ipfs_lite/ipld/impl/ipld_node_encoder_pb.cpp b/ipfs_lite/ipld/impl/ipld_node_encoder_pb.cpp
index 7e499f0..8617235 100644
--- a/ipfs_lite/ipld/impl/ipld_node_encoder_pb.cpp
+++ b/ipfs_lite/ipld/impl/ipld_node_encoder_pb.cpp
@@ -11,9 +11,10 @@ using protobuf::ipld::node::PBLink;
 using protobuf::ipld::node::PBNode;
 
 namespace sgns::ipfs_lite::ipld {
-  std::vector<uint8_t> IPLDNodeEncoderPB::encode(
-      const common::Buffer &content,
-      const std::map<std::string, IPLDLinkImpl> &links) {
+std::vector<uint8_t> IPLDNodeEncoderPB::encode(
+    const common::Buffer& content,
+    const std::map<std::string, IPLDLink>& links
+) {
     std::vector<uint8_t> links_pb = serializeLinks(links);
     std::vector<uint8_t> content_pb = serializeContent(content);
     std::vector<uint8_t> result;
@@ -24,66 +25,74 @@ namespace sgns::ipfs_lite::ipld {
                   std::move_iterator(content_pb.begin()),
                   std::move_iterator(content_pb.end()));
     return result;
-  }
+}
 
-  size_t IPLDNodeEncoderPB::getLinkLengthPB(const std::string &name,
-                                            const IPLDLinkImpl &link) {
-    size_t length{};
-    size_t cid_bytes_size = link.getCID().content_address.toBuffer().size();
-    length += cid_bytes_size;
-    length += CodedOutputStream::VarintSize64(cid_bytes_size);
-    length += name.size();
-    length += CodedOutputStream::VarintSize64(name.size());
-    length += CodedOutputStream::VarintSize64(link.getSize());
-    length += sizeof(PBTag) * 3;  // Count of the PBLink fields
-    return length;
+  size_t IPLDNodeEncoderPB::getLinkLengthPB(const std::string& name, const IPLDLink& link) {
+      size_t length{};
+      size_t cid_bytes_size = link.getCID().content_address.toBuffer().size();
+      length += cid_bytes_size;
+      length += CodedOutputStream::VarintSize64(cid_bytes_size);
+      length += name.size();
+      length += CodedOutputStream::VarintSize64(name.size());
+      length += CodedOutputStream::VarintSize64(link.getSize());
+      length += sizeof(PBTag) * 3; // Count of the PBLink fields
+      return length;
   }
 
   std::vector<uint8_t> IPLDNodeEncoderPB::serializeLinks(
-      const std::map<std::string, IPLDLinkImpl> &links) {
-    // Calculate links size:
-    size_t links_content_size{};
-    size_t links_headers_size{};
-    std::vector<size_t> links_size{};
-    for (const auto &link : links) {
-      links_size.push_back(getLinkLengthPB(link.first, link.second));
-      links_content_size += links_size.back();
-      links_headers_size += sizeof(PBTag);
-      links_headers_size += CodedOutputStream::VarintSize64(links_size.back());
-    }
-    if (links_content_size > 0) {
-      std::vector<uint8_t> buffer(links_content_size + links_headers_size);
-      ArrayOutputStream array_output_stream(buffer.data(), buffer.size());
-      CodedOutputStream coded_stream{&array_output_stream};
-      size_t link_index{};
-      for (const auto &link : links) {
-        PBTag links_tag = createTag(PBFieldType::LENGTH_DELEMITED,
-                                    static_cast<uint8_t>(PBNodeOrder::LINKS));
-        coded_stream.WriteTag(links_tag);
-        coded_stream.WriteVarint64(links_size.at(link_index));
-        // Write target Node's CID bytes:
-        const auto &cid_bytes = link.second.getCID().content_address.toBuffer();
-        PBTag cid_tag = createTag(PBFieldType::LENGTH_DELEMITED,
-                                  static_cast<uint8_t>(PBLinkOrder::HASH));
-        coded_stream.WriteTag(cid_tag);
-        coded_stream.WriteVarint64(cid_bytes.size());
-        coded_stream.WriteRaw(cid_bytes.data(), cid_bytes.size());
-        // Write link name:
-        PBTag name_tag = createTag(PBFieldType::LENGTH_DELEMITED,
-                                   static_cast<uint8_t>(PBLinkOrder::NAME));
-        coded_stream.WriteTag(name_tag);
-        coded_stream.WriteVarint64(link.first.size());
-        coded_stream.WriteRaw(link.first.data(), link.first.size());
-        // Write target Node's size:
-        PBTag size_tag = createTag(PBFieldType::VARINT,
-                                   static_cast<uint8_t>(PBLinkOrder::SIZE));
-        coded_stream.WriteTag(size_tag);
-        coded_stream.WriteVarint64(link.second.getSize());
-        ++link_index;
+      const std::map<std::string, IPLDLink>& links
+  ) {
+      // Calculate links size:
+      size_t links_content_size{};
+      size_t links_headers_size{};
+      std::vector<size_t> links_size{};
+      for (const auto& link : links) {
+          links_size.push_back(getLinkLengthPB(link.first, link.second));
+          links_content_size += links_size.back();
+          links_headers_size += sizeof(PBTag);
+          links_headers_size += CodedOutputStream::VarintSize64(links_size.back());
       }
-      return buffer;
-    }
-    return {};
+      if (links_content_size > 0) {
+          std::vector<uint8_t> buffer(links_content_size + links_headers_size);
+          ArrayOutputStream array_output_stream(buffer.data(), buffer.size());
+          CodedOutputStream coded_stream{&array_output_stream};
+          size_t link_index{};
+          for (const auto& link : links) {
+              PBTag links_tag = createTag(
+                  PBFieldType::LENGTH_DELEMITED,
+                  static_cast<uint8_t>(PBNodeOrder::LINKS)
+              );
+              coded_stream.WriteTag(links_tag);
+              coded_stream.WriteVarint64(links_size.at(link_index));
+              // Write target Node's CID bytes:
+              const auto& cid_bytes = link.second.getCID().content_address.toBuffer();
+              PBTag cid_tag = createTag(
+                  PBFieldType::LENGTH_DELEMITED,
+                  static_cast<uint8_t>(PBLinkOrder::HASH)
+              );
+              coded_stream.WriteTag(cid_tag);
+              coded_stream.WriteVarint64(cid_bytes.size());
+              coded_stream.WriteRaw(cid_bytes.data(), cid_bytes.size());
+              // Write link name:
+              PBTag name_tag = createTag(
+                  PBFieldType::LENGTH_DELEMITED,
+                  static_cast<uint8_t>(PBLinkOrder::NAME)
+              );
+              coded_stream.WriteTag(name_tag);
+              coded_stream.WriteVarint64(link.first.size());
+              coded_stream.WriteRaw(link.first.data(), link.first.size());
+              // Write target Node's size:
+              PBTag size_tag = createTag(
+                  PBFieldType::VARINT,
+                  static_cast<uint8_t>(PBLinkOrder::SIZE)
+              );
+              coded_stream.WriteTag(size_tag);
+              coded_stream.WriteVarint64(link.second.getSize());
+              ++link_index;
+          }
+          return buffer;
+      }
+      return {};
   }
 
   std::vector<uint8_t> IPLDNodeEncoderPB::serializeContent(
diff --git a/ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp b/ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp
index 387fd74..d616168 100644
--- a/ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp
+++ b/ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp
@@ -9,7 +9,7 @@
 #include <gsl/span>
 #include "common/buffer.hpp"
 #include "common/outcome.hpp"
-#include "ipfs_lite/ipld/impl/ipld_link_impl.hpp"
+#include "ipfs_lite/ipld/ipld_link.hpp"
 #include "ipfs_lite/ipld/ipld_node.hpp"
 
 namespace sgns::ipfs_lite::ipld {
@@ -28,8 +28,10 @@ namespace sgns::ipfs_lite::ipld {
      * @param links - references for child Nodes
      * @return Protobuf-encoded data
      */
-    static std::vector<uint8_t> encode(const common::Buffer &content,
-                                 const std::map<std::string, IPLDLinkImpl> &links);
+     static std::vector<uint8_t> encode(
+         const common::Buffer& content,
+         const std::map<std::string, IPLDLink>& links
+     );
 
    private:
     using PBTag = uint8_t;
@@ -57,7 +59,7 @@ namespace sgns::ipfs_lite::ipld {
      * @param link - child link
      * @return Number of bytes
      */
-    static size_t getLinkLengthPB(const std::string &name, const IPLDLinkImpl &link);
+    static size_t getLinkLengthPB(const std::string& name, const IPLDLink& link);
 
     /**
      * @brief Calculate length of the serialized content
@@ -71,8 +73,7 @@ namespace sgns::ipfs_lite::ipld {
      * @param links - Node's children
      * @return Raw bytes
      */
-    static std::vector<uint8_t> serializeLinks(
-        const std::map<std::string, IPLDLinkImpl> &links);
+    static std::vector<uint8_t> serializeLinks(const std::map<std::string, IPLDLink>& links);
 
     /**
      * @brief Serialized Node's content
diff --git a/ipfs_lite/ipld/impl/ipld_node_impl.cpp b/ipfs_lite/ipld/impl/ipld_node_impl.cpp
index 32b5ed0..f5179b6 100644
--- a/ipfs_lite/ipld/impl/ipld_node_impl.cpp
+++ b/ipfs_lite/ipld/impl/ipld_node_impl.cpp
@@ -33,12 +33,11 @@ namespace sgns::ipfs_lite::ipld {
 
   IPFS::outcome::result<void> IPLDNodeImpl::addChild(
       const std::string &name, std::shared_ptr<const IPLDNode> node) {
-    IPLDLinkImpl link{node->getCID(), name, node->size()};
-    links_.emplace(name, std::move(link));
-    ipld_block_ =
-        boost::none;  // Need to recalculate CID after adding link to child node
-    child_nodes_size_ += node->size();
-    return IPFS::outcome::success();
+      IPLDLink link{node->getCID(), name, node->size()};
+      links_.emplace(name, std::move(link));
+      ipld_block_ = boost::none; // Need to recalculate CID after adding link to child node
+      child_nodes_size_ += node->size();
+      return IPFS::outcome::success();
   }
 
   IPFS::outcome::result<std::reference_wrapper<const IPLDLink>> IPLDNodeImpl::getLink(
@@ -56,11 +55,6 @@ namespace sgns::ipfs_lite::ipld {
     }
   }
 
-  void IPLDNodeImpl::addLink(const IPLDLink &link) {
-    auto &link_impl = dynamic_cast<const IPLDLinkImpl &>(link);
-    links_.emplace(link.getName(), link_impl);
-  }
-
   std::vector<std::reference_wrapper<const IPLDLink>> IPLDNodeImpl::getLinks()
       const {
     std::vector<std::reference_wrapper<const IPLDLink>> link_refs{};
@@ -93,8 +87,7 @@ namespace sgns::ipfs_lite::ipld {
       std::vector<uint8_t> link_cid_bytes{decoder.getLinkCID(i).begin(),
                                           decoder.getLinkCID(i).end()};
       OUTCOME_TRY((auto &&, link_cid), CID::fromBytes(link_cid_bytes));
-      IPLDLinkImpl link{
-          std::move(link_cid), decoder.getLinkName(i), decoder.getLinkSize(i)};
+      IPLDLink link{std::move(link_cid), decoder.getLinkName(i), decoder.getLinkSize(i)};
       node->addLink(link);
     }
     return node;
diff --git a/ipfs_lite/ipld/impl/ipld_node_impl.hpp b/ipfs_lite/ipld/impl/ipld_node_impl.hpp
index 9c4d638..1b8e9e2 100644
--- a/ipfs_lite/ipld/impl/ipld_node_impl.hpp
+++ b/ipfs_lite/ipld/impl/ipld_node_impl.hpp
@@ -8,7 +8,8 @@
 #include <vector>
 
 #include <boost/optional.hpp>
-#include "ipfs_lite/ipld/impl/ipld_link_impl.hpp"
+#include "ipfs_lite/ipld/ipld_link.hpp"
+#include "ipfs_lite/ipld/ipld_block.hpp"
 #include "ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp"
 #include "ipfs_lite/ipld/ipld_node.hpp"
 
@@ -33,7 +34,9 @@ namespace sgns::ipfs_lite::ipld {
 
     void removeLink(const std::string &name) override;
 
-    void addLink(const IPLDLink &link) override;
+    void addLink(IPLDLink link) override {
+        links_.emplace(link.getName(), link);
+    }
 
     std::vector<std::reference_wrapper<const IPLDLink>> getLinks()
         const override;
@@ -50,7 +53,7 @@ namespace sgns::ipfs_lite::ipld {
 
    private:
     common::Buffer content_;
-    std::map<std::string, IPLDLinkImpl> links_;
+    std::map<std::string, IPLDLink> links_;
     IPLDNodeEncoderPB pb_node_codec_;
     size_t child_nodes_size_{};
     mutable boost::optional<IPLDBlock> ipld_block_;
diff --git a/ipfs_lite/ipld/ipld_link.hpp b/ipfs_lite/ipld/ipld_link.hpp
index 8b1e6c7..da91c0b 100644
--- a/ipfs_lite/ipld/ipld_link.hpp
+++ b/ipfs_lite/ipld/ipld_link.hpp
@@ -2,35 +2,56 @@
 #define IPFS_LITE_IPLD_LINK_HPP
 
 #include <string>
-#include <vector>
 
 #include "primitives/cid/cid.hpp"
 
 namespace sgns::ipfs_lite::ipld {
   class IPLDLink {
    public:
-    /**
+     /**
+     * @brief Construct Link
+     * @param id - CID of the target object
+     * @param name - name of the target object
+     * @param size - total size of the target object
+     */
+     IPLDLink(CID id, std::string name, size_t size):
+         cid_{std::move(id)},
+         name_{std::move(name)},
+         size_{size} {}
+
+     /**
      * @brief Destructor
      */
-    virtual ~IPLDLink() = default;
+     IPLDLink() = default;
 
-    /**
+     /**
      * @brief Get name of the link
      * @return Name, which should be unique per object
      */
-    virtual const std::string &getName() const = 0;
+     [[nodiscard]] const std::string& getName() const {
+         return name_;
+     }
 
     /**
      * @brief Get identifier of the target object
      * @return Content identifier
      */
-    virtual const CID &getCID() const = 0;
+     [[nodiscard]] const CID& getCID() const {
+         return cid_;
+     }
 
     /**
      * @brief Get target object size
      * @return Cumulative size of the target object
      */
-    virtual size_t getSize() const = 0;
+    [[nodiscard]] size_t getSize() const {
+        return size_;
+    }
+
+  private:
+    CID cid_;
+    std::string name_;
+    size_t size_{};
   };
 }  // namespace sgns::ipfs_lite::ipld
 
diff --git a/ipfs_lite/ipld/ipld_node.hpp b/ipfs_lite/ipld/ipld_node.hpp
index 8cc58c0..30416f7 100644
--- a/ipfs_lite/ipld/ipld_node.hpp
+++ b/ipfs_lite/ipld/ipld_node.hpp
@@ -8,7 +8,7 @@
 
 #include "common/buffer.hpp"
 #include "common/outcome.hpp"
-#include "ipfs_lite/ipld/ipld_block.hpp"
+
 #include "ipfs_lite/ipld/ipld_link.hpp"
 
 namespace sgns::ipfs_lite::ipld {
@@ -83,7 +83,7 @@ namespace sgns::ipfs_lite::ipld {
      * @brief Insert link to the child node
      * @param link - object to add
      */
-    virtual void addLink(const IPLDLink &link) = 0;
+    virtual void addLink(IPLDLink link) = 0;
 
     /**
      * @brief Get links to first-level child nodes
diff --git a/primitives/cid/json_codec.cpp b/primitives/cid/json_codec.cpp
index cc0b922..c47834b 100644
--- a/primitives/cid/json_codec.cpp
+++ b/primitives/cid/json_codec.cpp
@@ -1,13 +1,9 @@
 
-#include "primitives/cid/json_codec.hpp"
-
-#include <strstream>
+#include "json_codec.hpp"
 
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 
-#include "codec/cbor/cbor.hpp"
-
 namespace sgns::codec::json {
   using boost::property_tree::ptree;
 
diff --git a/test/core/ipfs_lite/ipfs/merkledag/ipfs_merkledag_service_test.cpp b/test/core/ipfs_lite/ipfs/merkledag/ipfs_merkledag_service_test.cpp
index 43a42c2..67561fa 100644
--- a/test/core/ipfs_lite/ipfs/merkledag/ipfs_merkledag_service_test.cpp
+++ b/test/core/ipfs_lite/ipfs/merkledag/ipfs_merkledag_service_test.cpp
@@ -140,17 +140,16 @@ TEST_P(CommonFeaturesTest, LinkOperationsConsistency) {
         node->getLinks();
     std::string primary_cid = cidToString(node);
     for (const auto &link : links) {
-      IPLDLinkImpl link_impl{
-          link.get().getCID(), link.get().getName(), link.get().getSize()};
-      EXPECT_OUTCOME_TRUE(received_link, node->getLink(link.get().getName()));
-      std::ignore = received_link;
-      std::string link_name = link.get().getName();
-      node->removeLink(link_name);
-      EXPECT_OUTCOME_FALSE(null_result, node->getLink(link_name));
-      std::ignore = null_result;
-      node->addLink(link_impl);
-      EXPECT_OUTCOME_TRUE(restored_link, node->getLink(link_name));
-      std::ignore = restored_link;
+        IPLDLink link_impl{link.get().getCID(), link.get().getName(), link.get().getSize()};
+        EXPECT_OUTCOME_TRUE(received_link, node->getLink(link.get().getName()));
+        std::ignore = received_link;
+        std::string link_name = link.get().getName();
+        node->removeLink(link_name);
+        EXPECT_OUTCOME_FALSE(null_result, node->getLink(link_name));
+        std::ignore = null_result;
+        node->addLink(link_impl);
+        EXPECT_OUTCOME_TRUE(restored_link, node->getLink(link_name));
+        std::ignore = restored_link;
     }
     std::string secondary_cid = cidToString(node);
     ASSERT_EQ(primary_cid, secondary_cid);

From d469fe3a9ea6a4eb81d25ecd4f3f97c73b66b2ce Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Wed, 21 May 2025 16:36:54 -0300
Subject: [PATCH 10/17] Inlined serialize method

---
 .../network/marshalling/message_builder.cpp   | 33 +++++++++++--------
 .../network/marshalling/message_builder.hpp   |  9 +++--
 .../impl/network/marshalling/serialize.cpp    | 33 -------------------
 .../impl/network/marshalling/serialize.hpp    | 32 ------------------
 4 files changed, 26 insertions(+), 81 deletions(-)
 delete mode 100644 ipfs_lite/ipfs/graphsync/impl/network/marshalling/serialize.cpp
 delete mode 100644 ipfs_lite/ipfs/graphsync/impl/network/marshalling/serialize.hpp

diff --git a/ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_builder.cpp b/ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_builder.cpp
index 61726ed..d95994a 100644
--- a/ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_builder.cpp
+++ b/ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_builder.cpp
@@ -1,7 +1,7 @@
-
 #include "message_builder.hpp"
 
-#include "serialize.hpp"
+#include <libp2p/multi/uvarint.hpp>
+
 #include "ipfs_lite/ipfs/graphsync/impl/common.hpp"
 
 #include "protobuf/message.pb.h"
@@ -14,22 +14,29 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
   // to type which is incomplete in header
   MessageBuilder::~MessageBuilder() = default;
 
-  bool MessageBuilder::empty() const {
-    return empty_;
-  }
-
   size_t MessageBuilder::getSerializedSize() const {
     return pb_msg_->ByteSizeLong();
   }
 
   IPFS::outcome::result<SharedData> MessageBuilder::serialize() {
-    auto res = serializeProtobufMessage(*pb_msg_);
-    if (!res) {
-      logger()->error("cannot serialize protobuf message, size={}",
-                      getSerializedSize());
-      return Error::MESSAGE_SERIALIZE_ERROR;
-    }
-    return res.value();
+      size_t msg_size = pb_msg_->ByteSizeLong();
+
+      auto encoded_size = libp2p::multi::UVarint{msg_size};
+      const auto& encoded_size_vec = encoded_size.toVector();
+      auto prefix_size = encoded_size_vec.size();
+
+      auto buffer = std::make_shared<libp2p::common::ByteArray>(prefix_size + msg_size);
+
+      uint8_t* data = buffer->data();
+
+      memcpy(data, encoded_size_vec.data(), prefix_size);
+
+      if (!pb_msg_->SerializeToArray(data + prefix_size, msg_size)) {
+          logger()->error("cannot serialize protobuf message, size={}", getSerializedSize());
+          return Error::MESSAGE_SERIALIZE_ERROR;
+      }
+
+      return buffer;
   }
 
   void MessageBuilder::clear() {
diff --git a/ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_builder.hpp b/ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_builder.hpp
index 7c90011..ecc83c1 100644
--- a/ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_builder.hpp
+++ b/ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_builder.hpp
@@ -2,7 +2,7 @@
 #ifndef CPP_IPFS_LITE_GRAPHSYNC_MESSAGE_BUILDER_HPP
 #define CPP_IPFS_LITE_GRAPHSYNC_MESSAGE_BUILDER_HPP
 
-#include "message.hpp"
+#include "ipfs_lite/ipfs/graphsync/impl/common.hpp"
 
 namespace sgns::ipfs_lite::ipfs::graphsync {
 
@@ -15,13 +15,16 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
   class MessageBuilder {
    public:
     MessageBuilder();
+
     virtual ~MessageBuilder();
 
     /// Returns if there is nothing to send
-    bool empty() const;
+    [[nodiscard]] bool empty() const {
+        return empty_;
+    }
 
     /// Returns serialized size of protobuf message
-    size_t getSerializedSize() const;
+    [[nodiscard]] size_t getSerializedSize() const;
 
     /// Serializes message to shared byte buffer
     IPFS::outcome::result<SharedData> serialize();
diff --git a/ipfs_lite/ipfs/graphsync/impl/network/marshalling/serialize.cpp b/ipfs_lite/ipfs/graphsync/impl/network/marshalling/serialize.cpp
deleted file mode 100644
index fcef69c..0000000
--- a/ipfs_lite/ipfs/graphsync/impl/network/marshalling/serialize.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#include <google/protobuf/message_lite.h>
-
-#include <libp2p/multi/uvarint.hpp>
-
-#include "serialize.hpp"
-
-namespace sgns::ipfs_lite::ipfs::graphsync {
-
-  boost::optional<std::shared_ptr<const libp2p::common::ByteArray>>
-  serializeProtobufMessage(const google::protobuf::MessageLite &msg) {
-    size_t msg_sz = msg.ByteSizeLong();
-
-    auto varint_len = libp2p::multi::UVarint{msg_sz};
-    const auto &varint_vec = varint_len.toVector();
-    size_t prefix_sz = varint_vec.size();
-
-    auto buffer =
-        std::make_shared<const libp2p::common::ByteArray>(prefix_sz + msg_sz);
-
-    // NOLINTNEXTLINE
-    uint8_t *data = const_cast<uint8_t *>(buffer->data());
-
-    memcpy(data, varint_vec.data(), prefix_sz);
-
-    // NOLINTNEXTLINE
-    if (!msg.SerializeToArray(data + prefix_sz, msg_sz)) {
-      return boost::none;
-    }
-    return buffer;
-  }
-
-}  // namespace sgns::ipfs_lite::ipfs::graphsync
diff --git a/ipfs_lite/ipfs/graphsync/impl/network/marshalling/serialize.hpp b/ipfs_lite/ipfs/graphsync/impl/network/marshalling/serialize.hpp
deleted file mode 100644
index 374f395..0000000
--- a/ipfs_lite/ipfs/graphsync/impl/network/marshalling/serialize.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#ifndef CPP_IPFS_LITE_GRAPHSYNC_SERIALIZE_HPP
-#define CPP_IPFS_LITE_GRAPHSYNC_SERIALIZE_HPP
-
-// TODO(FIL-144) move this stuff to libp2p
-
-#include <memory>
-
-#include <boost/optional.hpp>
-
-#include <libp2p/common/byteutil.hpp>
-
-namespace google::protobuf {
-  // protobuf's MessageLite fwd decl
-  class MessageLite;
-}
-
-namespace sgns::ipfs_lite::ipfs::graphsync {
-
-  /**
-   * Tries to serialize generic protobuf message into shared array of bytes
-   * with varint length prefix
-   * @param msg protobuf message
-   * @return shared buffer to serialized bytes, none if serialize failed, i.e.
-   * not all required fields are set in the msg
-   */
-  boost::optional<std::shared_ptr<const libp2p::common::ByteArray>>
-  serializeProtobufMessage(const google::protobuf::MessageLite &msg);
-
-}  // namespace sgns::ipfs_lite::ipfs::graphsync
-
-#endif  // CPP_IPFS_LITE_GRAPHSYNC_SERIALIZE_HPP

From dc2cc2c7f8e793cba16365b1a5bb43ee692c5c0f Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Wed, 21 May 2025 16:39:18 -0300
Subject: [PATCH 11/17] Removed `ipld_node_decoder` redundancy

---
 codec/cbor/cbor_encode_stream.cpp             |  3 ++
 ipfs_lite/ipfs/graphsync/extension.hpp        |  7 ++--
 ipfs_lite/ipfs/graphsync/impl/CMakeLists.txt  |  1 -
 ipfs_lite/ipfs/graphsync/impl/extension.cpp   | 17 ++++++----
 .../graphsync/impl/network/message_queue.hpp  |  1 +
 .../graphsync/impl/network/network_fwd.hpp    |  2 --
 .../impl/network/outbound_endpoint.hpp        |  1 +
 ipfs_lite/ipld/impl/ipld_node_decoder_pb.cpp  | 32 ------------------
 ipfs_lite/ipld/impl/ipld_node_decoder_pb.hpp  | 33 ++++++++++---------
 ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp  |  1 +
 ipfs_lite/ipld/impl/ipld_node_impl.cpp        |  5 +--
 ipfs_lite/ipld/impl/ipld_node_impl.hpp        |  1 -
 12 files changed, 39 insertions(+), 65 deletions(-)

diff --git a/codec/cbor/cbor_encode_stream.cpp b/codec/cbor/cbor_encode_stream.cpp
index 4bc3c88..503defa 100644
--- a/codec/cbor/cbor_encode_stream.cpp
+++ b/codec/cbor/cbor_encode_stream.cpp
@@ -40,10 +40,12 @@ namespace sgns::codec::cbor {
     if (maybe_cid_bytes.has_error()) {
       IPFS::outcome::raise(CborEncodeError::INVALID_CID);
     }
+    
     auto cid_bytes = maybe_cid_bytes.value();
     cid_bytes.insert(cid_bytes.begin(), 0);
 
     std::array<uint8_t, 9> encoded{0};
+    
     CborEncoder encoder;
     cbor_encoder_init(&encoder, encoded.data(), encoded.size(), 0);
     cbor_encode_tag(&encoder, kCidTag);
@@ -51,6 +53,7 @@ namespace sgns::codec::cbor {
                  encoded.begin(),
                  encoded.begin()
                      + cbor_encoder_get_buffer_size(&encoder, encoded.data()));
+
     *this << cid_bytes;
     return *this;
   }
diff --git a/ipfs_lite/ipfs/graphsync/extension.hpp b/ipfs_lite/ipfs/graphsync/extension.hpp
index b3628c2..3646f72 100644
--- a/ipfs_lite/ipfs/graphsync/extension.hpp
+++ b/ipfs_lite/ipfs/graphsync/extension.hpp
@@ -2,7 +2,6 @@
 #ifndef CPP_IPFS_LITE_GRAPHSYNC_EXTENSION_HPP
 #define CPP_IPFS_LITE_GRAPHSYNC_EXTENSION_HPP
 
-#include <set>
 #include <string>
 
 #include "primitives/cid/cid.hpp"
@@ -11,17 +10,15 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
 
   constexpr std::string_view kResponseMetadataProtocol =
       "graphsync/response-metadata";
+
   constexpr std::string_view kDontSendCidsProtocol =
       "graphsync/do-not-send-cids";
 
-  /**
-   * ExtensionData is a name/data pair for a graphsync extension
-   */
   struct Extension {
     std::string name;
     std::vector<uint8_t> data;
 
-    inline bool operator==(const Extension &other) const {
+    bool operator==(const Extension &other) const {
       return name == other.name && data == other.data;
     }
   };
diff --git a/ipfs_lite/ipfs/graphsync/impl/CMakeLists.txt b/ipfs_lite/ipfs/graphsync/impl/CMakeLists.txt
index 7214eea..5ceb208 100644
--- a/ipfs_lite/ipfs/graphsync/impl/CMakeLists.txt
+++ b/ipfs_lite/ipfs/graphsync/impl/CMakeLists.txt
@@ -11,7 +11,6 @@ add_library(graphsync
     network/message_queue.cpp
     network/outbound_endpoint.cpp
     network/inbound_endpoint.cpp
-    network/marshalling/serialize.cpp
     network/marshalling/message_parser.cpp
     network/marshalling/message_builder.cpp
     network/marshalling/request_builder.cpp
diff --git a/ipfs_lite/ipfs/graphsync/impl/extension.cpp b/ipfs_lite/ipfs/graphsync/impl/extension.cpp
index 4716009..9183986 100644
--- a/ipfs_lite/ipfs/graphsync/impl/extension.cpp
+++ b/ipfs_lite/ipfs/graphsync/impl/extension.cpp
@@ -1,8 +1,8 @@
 #include "ipfs_lite/ipfs/graphsync/extension.hpp"
 
+#include "common.hpp"
 #include "codec/cbor/cbor_decode_stream.hpp"
 #include "codec/cbor/cbor_encode_stream.hpp"
-#include "common.hpp"
 
 namespace sgns::ipfs_lite::ipfs::graphsync {
 
@@ -10,11 +10,10 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
   using codec::cbor::CborEncodeStream;
 
   namespace {
-
     const std::string link("link");
     const std::string blockPresent("blockPresent");
 
-    // encodes metadata item, {"link":CID, "blockPresent":bool}
+    // Encodes metadata item {"link": CID, "blockPresent": bool}
     std::map<std::string, CborEncodeStream> encodeMetadataItem(
         const std::pair<CID, bool> &item) {
       std::map<std::string, CborEncodeStream> m;
@@ -27,12 +26,15 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
     IPFS::outcome::result<bool> decodeBool(uint8_t byte) {
       constexpr uint8_t kCborFalse = 0xF4;
       constexpr uint8_t kCborTrue = 0xF5;
+
       if (byte == kCborFalse) {
         return false;
-      } else if (byte == kCborTrue) {
+      }
+      if (byte == kCborTrue) {
         return true;
       }
-      logger()->warn("{}: wrong cbor encoding: bool expected", __FUNCTION__);
+
+      logger()->error("{}: wrong cbor encoding: bool expected", __FUNCTION__);
       return Error::MESSAGE_PARSE_ERROR;
     }
 
@@ -42,7 +44,7 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
       if (s.size() == 1) {
         return decodeBool((uint8_t)s[0]);
       }
-      logger()->warn("{}: wrong cbor encoding: single byte expected",
+      logger()->error("{}: wrong cbor encoding: single byte expected",
                      __FUNCTION__);
       return Error::MESSAGE_PARSE_ERROR;
     }
@@ -52,12 +54,15 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
   Extension encodeResponseMetadata(const ResponseMetadata &metadata) {
     Extension e;
     e.name = kResponseMetadataProtocol;
+
     auto l = CborEncodeStream::list();
     for (const auto &item : metadata) {
       l << encodeMetadataItem(item);
     }
+
     CborEncodeStream encoder;
     encoder << l;
+    
     e.data = std::move(encoder.data());
     return e;
   }
diff --git a/ipfs_lite/ipfs/graphsync/impl/network/message_queue.hpp b/ipfs_lite/ipfs/graphsync/impl/network/message_queue.hpp
index 75d3f7d..da6acd7 100644
--- a/ipfs_lite/ipfs/graphsync/impl/network/message_queue.hpp
+++ b/ipfs_lite/ipfs/graphsync/impl/network/message_queue.hpp
@@ -3,6 +3,7 @@
 #define CPP_IPFS_LITE_GRAPHSYNC_MESSAGE_QUEUE_HPP
 
 #include "network_fwd.hpp"
+#include <deque>
 
 namespace sgns::ipfs_lite::ipfs::graphsync {
 
diff --git a/ipfs_lite/ipfs/graphsync/impl/network/network_fwd.hpp b/ipfs_lite/ipfs/graphsync/impl/network/network_fwd.hpp
index 168896b..15691cf 100644
--- a/ipfs_lite/ipfs/graphsync/impl/network/network_fwd.hpp
+++ b/ipfs_lite/ipfs/graphsync/impl/network/network_fwd.hpp
@@ -1,7 +1,5 @@
-
 #ifndef CPP_IPFS_LITE_GRAPHSYNC_NETWORK_FWD_HPP
 #define CPP_IPFS_LITE_GRAPHSYNC_NETWORK_FWD_HPP
-#include <deque>
 
 #include <libp2p/protocol/common/scheduler.hpp>
 #include "marshalling/message.hpp"
diff --git a/ipfs_lite/ipfs/graphsync/impl/network/outbound_endpoint.hpp b/ipfs_lite/ipfs/graphsync/impl/network/outbound_endpoint.hpp
index 079aea0..1f950d6 100644
--- a/ipfs_lite/ipfs/graphsync/impl/network/outbound_endpoint.hpp
+++ b/ipfs_lite/ipfs/graphsync/impl/network/outbound_endpoint.hpp
@@ -3,6 +3,7 @@
 #define CPP_IPFS_LITE_GRAPHSYNC_OUTBOUND_ENDPOINT_HPP
 
 #include "network_fwd.hpp"
+#include <deque>
 
 namespace sgns::ipfs_lite::ipfs::graphsync {
 
diff --git a/ipfs_lite/ipld/impl/ipld_node_decoder_pb.cpp b/ipfs_lite/ipld/impl/ipld_node_decoder_pb.cpp
index 3ffdf07..a139458 100644
--- a/ipfs_lite/ipld/impl/ipld_node_decoder_pb.cpp
+++ b/ipfs_lite/ipld/impl/ipld_node_decoder_pb.cpp
@@ -1,37 +1,5 @@
 #include "ipfs_lite/ipld/impl/ipld_node_decoder_pb.hpp"
 
-namespace sgns::ipfs_lite::ipld {
-  IPFS::outcome::result<void> IPLDNodeDecoderPB::decode(
-      gsl::span<const uint8_t> input) {
-    const uint8_t *raw_bytes = input.data();
-    if (pb_node_.ParseFromArray(raw_bytes, input.size())) {
-      return IPFS::outcome::success();
-    }
-    return IPLDNodeDecoderPBError::INVALID_RAW_BYTES;
-  }
-
-  const std::string &IPLDNodeDecoderPB::getContent() const {
-    return pb_node_.data();
-  }
-
-  size_t IPLDNodeDecoderPB::getLinksCount() const {
-    return pb_node_.links_size();
-  }
-
-  const std::string &IPLDNodeDecoderPB::getLinkName(size_t index) const {
-    return pb_node_.links(index).name();
-  }
-
-  const std::string &IPLDNodeDecoderPB::getLinkCID(size_t index) const {
-    return pb_node_.links(index).hash();
-  }
-
-  size_t IPLDNodeDecoderPB::getLinkSize(size_t index) const {
-    int size = pb_node_.links(index).tsize();
-    return size < 0 ? 0 : static_cast<size_t>(size);
-  }
-}  // namespace sgns::ipfs_lite::ipld
-
 OUTCOME_CPP_DEFINE_CATEGORY_3(sgns::ipfs_lite::ipld, IPLDNodeDecoderPBError, error) {
   using sgns::ipfs_lite::ipld::IPLDNodeDecoderPBError;
   switch (error) {
diff --git a/ipfs_lite/ipld/impl/ipld_node_decoder_pb.hpp b/ipfs_lite/ipld/impl/ipld_node_decoder_pb.hpp
index 3dbe8fd..8cad98f 100644
--- a/ipfs_lite/ipld/impl/ipld_node_decoder_pb.hpp
+++ b/ipfs_lite/ipld/impl/ipld_node_decoder_pb.hpp
@@ -5,7 +5,6 @@
 #include <string>
 
 #include <gsl/span>
-#include "common/buffer.hpp"
 #include "common/outcome.hpp"
 #include "ipfs_lite/ipld/impl/protobuf/ipld_node.pb.h"
 
@@ -14,48 +13,50 @@ namespace sgns::ipfs_lite::ipld {
    * @class     Protobuf Node decoder
    */
   class IPLDNodeDecoderPB {
-   public:
-    /**
-     * @brief Try to decode input bytes as Protobuf-encoded Node
-     * @param input - bytes to decode
-     * @return operation result
-     */
-    IPFS::outcome::result<void> decode(gsl::span<const uint8_t> input);
-
-    /**
+    public:
+      /**
      * @brief Get Node content
      * @return content data
      */
-    const std::string &getContent() const;
+      const std::string& getContent() const {
+          return pb_node_.data();
+      }
 
     /**
      * @brief Get count of the children
      * @return Links num
      */
-    size_t getLinksCount() const;
+    size_t getLinksCount() const {
+        return pb_node_.links_size();
+    }
 
     /**
      * @brief Get link to the children name
      * @param index - id of the link
      * @return operation result
      */
-    const std::string &getLinkName(size_t index) const;
+    const std::string& getLinkName(size_t index) const {
+        return pb_node_.links(index).name();
+    }
 
     /**
      * @brief Get CID of the children
      * @param index - id of the link
      * @return CID bytes
      */
-    const std::string &getLinkCID(size_t index) const;
+    const std::string& getLinkCID(size_t index) const {
+        return pb_node_.links(index).hash();
+    }
 
     /**
      * @brief Get name of the link to the children
      * @param index - id of the link
      * @return operation result
      */
-    size_t getLinkSize(size_t index) const;
+    uint64_t getLinkSize(size_t index) const {
+        return pb_node_.links(index).tsize();
+    }
 
-   private:
     ::protobuf::ipld::node::PBNode pb_node_;
   };
 
diff --git a/ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp b/ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp
index d616168..a00f616 100644
--- a/ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp
+++ b/ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp
@@ -7,6 +7,7 @@
 #include <string>
 
 #include <gsl/span>
+
 #include "common/buffer.hpp"
 #include "common/outcome.hpp"
 #include "ipfs_lite/ipld/ipld_link.hpp"
diff --git a/ipfs_lite/ipld/impl/ipld_node_impl.cpp b/ipfs_lite/ipld/impl/ipld_node_impl.cpp
index f5179b6..5b3fdd4 100644
--- a/ipfs_lite/ipld/impl/ipld_node_impl.cpp
+++ b/ipfs_lite/ipld/impl/ipld_node_impl.cpp
@@ -79,9 +79,10 @@ namespace sgns::ipfs_lite::ipld {
   IPFS::outcome::result<std::shared_ptr<IPLDNode>> IPLDNodeImpl::createFromRawBytes(
       gsl::span<const uint8_t> input) {
     IPLDNodeDecoderPB decoder;
-    if (auto result = decoder.decode(input); result.has_error()) {
-      return result.error();
+    if (auto result = decoder.pb_node_.ParseFromArray(input.data(), input.size()); !result) {
+      return IPLDNodeDecoderPBError::INVALID_RAW_BYTES;
     }
+
     auto node = createFromString(decoder.getContent());
     for (size_t i = 0; i < decoder.getLinksCount(); ++i) {
       std::vector<uint8_t> link_cid_bytes{decoder.getLinkCID(i).begin(),
diff --git a/ipfs_lite/ipld/impl/ipld_node_impl.hpp b/ipfs_lite/ipld/impl/ipld_node_impl.hpp
index 1b8e9e2..cf2fc27 100644
--- a/ipfs_lite/ipld/impl/ipld_node_impl.hpp
+++ b/ipfs_lite/ipld/impl/ipld_node_impl.hpp
@@ -4,7 +4,6 @@
 
 #include <map>
 #include <memory>
-#include <string_view>
 #include <vector>
 
 #include <boost/optional.hpp>

From 50203e383e7ea32eb773f5771a337074946795d8 Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Wed, 21 May 2025 17:28:02 -0300
Subject: [PATCH 12/17] Message parser check

---
 .../network/marshalling/message_parser.cpp    | 184 +++++++++---------
 1 file changed, 92 insertions(+), 92 deletions(-)

diff --git a/ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_parser.cpp b/ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_parser.cpp
index 7c01982..c92db10 100644
--- a/ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_parser.cpp
+++ b/ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_parser.cpp
@@ -8,127 +8,127 @@
 #include "protobuf/message.pb.h"
 
 namespace sgns::ipfs_lite::ipfs::graphsync {
-  namespace {
-    using codec::cbor::CborDecodeStream;
+namespace {
+using codec::cbor::CborDecodeStream;
 
-    // Dummy protobuf helper, string->bytes
-    inline auto fromString(const std::string &src) {
-      return common::Buffer{common::span::cbytes(src)};
-    }
-
-    // Checks status code received from wire
-    IPFS::outcome::result<ResponseStatusCode> extractStatusCode(int code) {
-      switch (code) {
-// clang-format off
+// Checks status code received from wire
+IPFS::outcome::result<ResponseStatusCode> extractStatusCode(int code) {
+    switch (code) {
+        // clang-format off
 #define CHECK_CASE(X) case RS_##X: return RS_##X;
-        CHECK_CASE(FULL_CONTENT)
-        CHECK_CASE(PARTIAL_CONTENT)
-        CHECK_CASE(NOT_FOUND)
+        CHECK_CASE(NO_PEERS)
+        CHECK_CASE(CANNOT_CONNECT)
+        CHECK_CASE(TIMEOUT)
+        CHECK_CASE(CONNECTION_ERROR)
+        CHECK_CASE(INTERNAL_ERROR)
+        CHECK_CASE(REJECTED_LOCALLY)
+        CHECK_CASE(SLOW_STREAM)
+        CHECK_CASE(AWAITING_STATUS)
+
         CHECK_CASE(REQUEST_ACKNOWLEDGED)
         CHECK_CASE(ADDITIONAL_PEERS)
         CHECK_CASE(NOT_ENOUGH_GAS)
         CHECK_CASE(OTHER_PROTOCOL)
         CHECK_CASE(PARTIAL_RESPONSE)
+
+        CHECK_CASE(FULL_CONTENT)
+        CHECK_CASE(PARTIAL_CONTENT)
+
         CHECK_CASE(REJECTED)
         CHECK_CASE(TRY_AGAIN)
         CHECK_CASE(REQUEST_FAILED)
         CHECK_CASE(LEGAL_ISSUES)
+        CHECK_CASE(NOT_FOUND)
 #undef CHECK_CASE
-          // clang-format on
+        // clang-format on
 
         default:
-          break;
-      }
-      logger()->warn("{}: unknonwn status code {}", __FUNCTION__, code);
-      return Error::MESSAGE_PARSE_ERROR;
+            logger()->error("{}: unknonwn status code {}", __FUNCTION__, code);
+            return Error::MESSAGE_PARSE_ERROR;
     }
+}
 
-    // Extracts requests from protobuf message
-    IPFS::outcome::result<void> parseRequests(pb::Message &pb_msg, Message &msg) {
-      auto sz = pb_msg.requests_size();
-      if (sz > 0) {
+// Extracts requests from protobuf message
+IPFS::outcome::result<void> parseRequests(pb::Message& pb_msg, Message& msg) {
+    if (auto sz = pb_msg.requests_size(); sz > 0) {
         msg.requests.reserve(sz);
-        for (auto &src : pb_msg.requests()) {
-          auto &dst = msg.requests.emplace_back(Message::Request());
-          dst.id = src.id();
-          if (src.cancel()) {
-            dst.cancel = true;
-          } else {
-            OUTCOME_TRY((auto &&, cid), CID::fromBytes(common::span::cbytes(src.root())));
-            dst.root_cid = std::move(cid);
-            dst.selector = fromString(src.selector());
-            dst.priority = src.priority();
-
-            // for (const auto &[k, v] : src.extensions()) {
-            //   std::vector<uint8_t> data(v.begin(), v.end());
-            //   dst.extensions.emplace_back(Extension{k, data});
-            // }
-            for (const auto &kv : src.extensions()) {
-              std::vector<uint8_t> data(kv.second.begin(), kv.second.end());
-              dst.extensions.emplace_back(Extension{kv.first, data});
+
+        for (const auto& src : pb_msg.requests()) {
+            Message::Request dst;
+            dst.id = src.id();
+
+            if (src.cancel()) {
+                dst.cancel = true;
+            } else {
+                OUTCOME_TRY((auto&&, cid), CID::fromBytes(common::span::cbytes(src.root())));
+                dst.root_cid = std::move(cid);
+                dst.selector = common::Buffer{common::span::cbytes(src.selector())};
+                dst.priority = src.priority();
+
+                for (const auto& kv : src.extensions()) {
+                    std::vector<uint8_t> data(kv.second.begin(), kv.second.end());
+                    dst.extensions.emplace_back(Extension{kv.first, data});
+                }
             }
-          }
+
+            msg.requests.emplace_back(dst);
         }
-      }
-      return IPFS::outcome::success();
     }
 
-    // Extracts responses from protobuf message
-    IPFS::outcome::result<void> parseResponses(pb::Message &pb_msg, Message &msg) {
-      size_t sz = pb_msg.responses_size();
-      if (sz > 0) {
+    return IPFS::outcome::success();
+}
+
+// Extracts responses from protobuf message
+IPFS::outcome::result<void> parseResponses(pb::Message& pb_msg, Message& msg) {
+    size_t sz = pb_msg.responses_size();
+    if (sz > 0) {
         msg.responses.reserve(sz);
 
-        for (auto &src : pb_msg.responses()) {
-          auto &dst = msg.responses.emplace_back(Message::Response());
-          dst.id = src.id();
-          OUTCOME_TRY((auto &&, status), extractStatusCode(src.status()));
-          dst.status = status;
-
-          // for (const auto &[k, v] : src.extensions()) {
-          //   std::vector<uint8_t> data(v.begin(), v.end());
-          //   dst.extensions.emplace_back(Extension{k, data});
-          // }
-          for (const auto &kv : src.extensions()) {
-            std::vector<uint8_t> data(kv.second.begin(), kv.second.end());
-            dst.extensions.emplace_back(Extension{kv.first, data});
-          }
+        for (const auto& src : pb_msg.responses()) {
+            auto& dst = msg.responses.emplace_back(Message::Response());
+            dst.id = src.id();
+            OUTCOME_TRY((auto&&, status), extractStatusCode(src.status()));
+            dst.status = status;
+
+            for (const auto& kv : src.extensions()) {
+                std::vector<uint8_t> data(kv.second.begin(), kv.second.end());
+                dst.extensions.emplace_back(Extension{kv.first, data});
+            }
         }
-      }
-      return IPFS::outcome::success();
     }
+    return IPFS::outcome::success();
+}
 
-    // Extracts data blocks from protobuf message
-    IPFS::outcome::result<void> parseBlocks(pb::Message &pb_msg, Message &msg) {
-      size_t sz = pb_msg.data_size();
-      if (sz > 0) {
+// Extracts data blocks from protobuf message
+IPFS::outcome::result<void> parseBlocks(pb::Message& pb_msg, Message& msg) {
+    size_t sz = pb_msg.data_size();
+    if (sz > 0) {
         msg.data.reserve(sz);
 
-        for (auto &src : pb_msg.data()) {
-          auto data = fromString(src.data());
-          auto prefix_reader = common::span::cbytes(src.prefix());
-          OUTCOME_TRY((auto &&, cid), CID::read(prefix_reader, true));
-          if (!prefix_reader.empty()) {
-            return Error::MESSAGE_PARSE_ERROR;
-          }
-          cid.content_address =
-              crypto::IPFSHasher::calculate(cid.content_address.getType(), data);
-          msg.data.emplace_back(std::move(cid), data);
+        for (const auto& src : pb_msg.data()) {
+            auto data = common::Buffer{common::span::cbytes(src.data())};
+            auto prefix_reader = common::span::cbytes(src.prefix());
+            OUTCOME_TRY((auto&&, cid), CID::read(prefix_reader, true));
+            if (!prefix_reader.empty()) {
+                return Error::MESSAGE_PARSE_ERROR;
+            }
+            cid.content_address = crypto::IPFSHasher::calculate(
+                cid.content_address.getType(),
+                data
+            );
+            msg.data.emplace_back(std::move(cid), data);
         }
-      }
-      return IPFS::outcome::success();
     }
+    return IPFS::outcome::success();
+}
+}
 
-  }  // namespace
-
-  IPFS::outcome::result<Message> parseMessage(gsl::span<const uint8_t> bytes) {
+IPFS::outcome::result<Message> parseMessage(gsl::span<const uint8_t> bytes) {
     pb::Message pb_msg;
 
     if (!pb_msg.ParseFromArray(bytes.data(), bytes.size())) {
-      logger()->warn("{}: cannot parse protobuf message, size={}",
-                     __FUNCTION__,
-                     bytes.size());
-      return Error::MESSAGE_PARSE_ERROR;
+        logger()->warn("{}: cannot parse protobuf message, size={}", __FUNCTION__, bytes.size());
+        return Error::MESSAGE_PARSE_ERROR;
     }
 
     Message msg;
@@ -137,20 +137,20 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
 
     auto res = parseRequests(pb_msg, msg);
     if (!res) {
-      return res.error();
+        return res.error();
     }
 
     res = parseResponses(pb_msg, msg);
     if (!res) {
-      return res.error();
+        return res.error();
     }
 
     res = parseBlocks(pb_msg, msg);
     if (!res) {
-      return res.error();
+        return res.error();
     }
 
     return msg;
-  }
+}
 
-}  // namespace sgns::ipfs_lite::ipfs::graphsync
+} // namespace sgns::ipfs_lite::ipfs::graphsync

From 443c688019676ecb2dae66a106fb259fc56fffac Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Wed, 28 May 2025 07:51:33 -0300
Subject: [PATCH 13/17] Removed redundant member in `inbound_endpoint`

---
 .../graphsync/impl/network/inbound_endpoint.cpp   | 15 +++++++--------
 .../graphsync/impl/network/inbound_endpoint.hpp   |  4 ----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ipfs_lite/ipfs/graphsync/impl/network/inbound_endpoint.cpp b/ipfs_lite/ipfs/graphsync/impl/network/inbound_endpoint.cpp
index 3c3d361..5ff612f 100644
--- a/ipfs_lite/ipfs/graphsync/impl/network/inbound_endpoint.cpp
+++ b/ipfs_lite/ipfs/graphsync/impl/network/inbound_endpoint.cpp
@@ -1,23 +1,22 @@
 
 #include "inbound_endpoint.hpp"
+#include "network_fwd.hpp"
 
 #include "message_queue.hpp"
 #include "peer_context.hpp"
 
 namespace sgns::ipfs_lite::ipfs::graphsync {
 
-  InboundEndpoint::InboundEndpoint(std::shared_ptr<MessageQueue> queue)
-      : max_pending_bytes_(kMaxPendingBytes), queue_(std::move(queue)) {
+InboundEndpoint::InboundEndpoint(std::shared_ptr<MessageQueue> queue): queue_(std::move(queue)) {
     assert(queue_);
-  }
+}
 
   IPFS::outcome::result<void> InboundEndpoint::addBlockToResponse(
       int request_id, const CID &cid, const common::Buffer &data) {
     auto serialized_size = response_builder_.getSerializedSize();
 
-    if (queue_->getState().pending_bytes + serialized_size + data.size()
-        > max_pending_bytes_) {
-      return Error::WRITE_QUEUE_OVERFLOW;
+    if (queue_->getState().pending_bytes + serialized_size + data.size() > kMaxPendingBytes) {
+        return Error::WRITE_QUEUE_OVERFLOW;
     }
 
     if (serialized_size + data.size() > kMaxMessageSize) {
@@ -42,8 +41,8 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
       return res.error();
     }
 
-    if (queue_->getState().pending_bytes > max_pending_bytes_) {
-      return Error::WRITE_QUEUE_OVERFLOW;
+    if (queue_->getState().pending_bytes > kMaxPendingBytes) {
+        return Error::WRITE_QUEUE_OVERFLOW;
     }
 
     queue_->enqueue(std::move(res.value()));
diff --git a/ipfs_lite/ipfs/graphsync/impl/network/inbound_endpoint.hpp b/ipfs_lite/ipfs/graphsync/impl/network/inbound_endpoint.hpp
index 7a26fa4..9065377 100644
--- a/ipfs_lite/ipfs/graphsync/impl/network/inbound_endpoint.hpp
+++ b/ipfs_lite/ipfs/graphsync/impl/network/inbound_endpoint.hpp
@@ -3,7 +3,6 @@
 #define CPP_IPFS_LITE_GRAPHSYNC_INBOUND_ENDPOINT_HPP
 
 #include "marshalling/response_builder.hpp"
-#include "network_fwd.hpp"
 
 namespace sgns::ipfs_lite::ipfs::graphsync {
 
@@ -42,9 +41,6 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
     /// \return result of queue operation
     IPFS::outcome::result<void> sendPartialResponse(RequestId request_id);
 
-    /// Max pending bytes in message queue.
-    const size_t max_pending_bytes_;
-
     /// Queues of network messages
     std::shared_ptr<MessageQueue> queue_;
 

From 0041e9cb232ea353e5837bd26273fd1b1f83b36d Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Wed, 28 May 2025 07:52:36 -0300
Subject: [PATCH 14/17] Formatting

---
 .../impl/network/length_delimited_message_reader.cpp        | 6 ++++--
 ipfs_lite/ipfs/graphsync/impl/network/message_queue.hpp     | 1 -
 ipfs_lite/ipfs/graphsync/impl/network/message_reader.cpp    | 5 +++--
 ipfs_lite/ipfs/graphsync/impl/network/network.cpp           | 3 ---
 ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp                | 2 --
 ipfs_lite/ipld/ipld_block.hpp                               | 2 --
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ipfs_lite/ipfs/graphsync/impl/network/length_delimited_message_reader.cpp b/ipfs_lite/ipfs/graphsync/impl/network/length_delimited_message_reader.cpp
index 2809a90..b014a26 100644
--- a/ipfs_lite/ipfs/graphsync/impl/network/length_delimited_message_reader.cpp
+++ b/ipfs_lite/ipfs/graphsync/impl/network/length_delimited_message_reader.cpp
@@ -67,12 +67,14 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
 
     if (length == 0) {
       reading_ = false;
-      return feedback_(stream_, Error::STREAM_NOT_READABLE);
+      feedback_(stream_, Error::STREAM_NOT_READABLE);
+      return;
     }
 
     if (length > max_message_size_) {
       reading_ = false;
-      return feedback_(stream_, Error::MESSAGE_SIZE_OUT_OF_BOUNDS);
+      feedback_(stream_, Error::MESSAGE_SIZE_OUT_OF_BOUNDS);
+      return;
     }
 
     buffer_->resize(length);
diff --git a/ipfs_lite/ipfs/graphsync/impl/network/message_queue.hpp b/ipfs_lite/ipfs/graphsync/impl/network/message_queue.hpp
index da6acd7..6b30762 100644
--- a/ipfs_lite/ipfs/graphsync/impl/network/message_queue.hpp
+++ b/ipfs_lite/ipfs/graphsync/impl/network/message_queue.hpp
@@ -1,4 +1,3 @@
-
 #ifndef CPP_IPFS_LITE_GRAPHSYNC_MESSAGE_QUEUE_HPP
 #define CPP_IPFS_LITE_GRAPHSYNC_MESSAGE_QUEUE_HPP
 
diff --git a/ipfs_lite/ipfs/graphsync/impl/network/message_reader.cpp b/ipfs_lite/ipfs/graphsync/impl/network/message_reader.cpp
index 7e2835b..866e32f 100644
--- a/ipfs_lite/ipfs/graphsync/impl/network/message_reader.cpp
+++ b/ipfs_lite/ipfs/graphsync/impl/network/message_reader.cpp
@@ -3,8 +3,8 @@
 
 #include <cassert>
 
+#include "ipfs_lite/ipfs/graphsync/impl/network/marshalling/message_parser.hpp"
 #include "length_delimited_message_reader.hpp"
-#include "marshalling/message_parser.hpp"
 #include "peer_context.hpp"
 
 namespace sgns::ipfs_lite::ipfs::graphsync {
@@ -34,7 +34,8 @@ namespace sgns::ipfs_lite::ipfs::graphsync {
   void MessageReader::onMessageRead(const StreamPtr &stream,
                                     IPFS::outcome::result<ByteArray> res) {
     if (!res) {
-      return feedback_.onReaderEvent(stream, res.error());
+      feedback_.onReaderEvent(stream, res.error());
+      return;
     }
 
     auto msg_res = parseMessage(res.value());
diff --git a/ipfs_lite/ipfs/graphsync/impl/network/network.cpp b/ipfs_lite/ipfs/graphsync/impl/network/network.cpp
index d67f316..814909a 100644
--- a/ipfs_lite/ipfs/graphsync/impl/network/network.cpp
+++ b/ipfs_lite/ipfs/graphsync/impl/network/network.cpp
@@ -2,9 +2,6 @@
 
 #include <cassert>
 
-#include "inbound_endpoint.hpp"
-#include "message_reader.hpp"
-#include "outbound_endpoint.hpp"
 #include "peer_context.hpp"
 
 namespace sgns::ipfs_lite::ipfs::graphsync {
diff --git a/ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp b/ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp
index a00f616..f2e53e5 100644
--- a/ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp
+++ b/ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp
@@ -3,7 +3,6 @@
 #define IPFS_LITE_IPLD_NODE_ENCODER_PB
 
 #include <map>
-#include <memory>
 #include <string>
 
 #include <gsl/span>
@@ -11,7 +10,6 @@
 #include "common/buffer.hpp"
 #include "common/outcome.hpp"
 #include "ipfs_lite/ipld/ipld_link.hpp"
-#include "ipfs_lite/ipld/ipld_node.hpp"
 
 namespace sgns::ipfs_lite::ipld {
   /**
diff --git a/ipfs_lite/ipld/ipld_block.hpp b/ipfs_lite/ipld/ipld_block.hpp
index 7529fe7..33d79aa 100644
--- a/ipfs_lite/ipld/ipld_block.hpp
+++ b/ipfs_lite/ipld/ipld_block.hpp
@@ -1,8 +1,6 @@
 #ifndef IPFS_LITE_IPLD_BLOCK_HPP
 #define IPFS_LITE_IPLD_BLOCK_HPP
 
-#include <vector>
-
 #include "codec/cbor/cbor.hpp"
 #include "common/buffer.hpp"
 #include "crypto/hasher/hasher.hpp"

From 85db3afeaccd31d140b21420f11383279bd4bbf0 Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Wed, 28 May 2025 07:52:50 -0300
Subject: [PATCH 15/17] Removed `IPLDNode` abstraction

---
 .../merkledag/impl/merkledag_service_impl.cpp | 89 +++++++++++--------
 .../merkledag/impl/merkledag_service_impl.hpp |  7 +-
 ipfs_lite/ipld/CMakeLists.txt                 |  2 +-
 ipfs_lite/ipld/impl/ipld_node_impl.hpp        | 75 ----------------
 .../ipld_node_impl.cpp => ipld_node.cpp}      | 54 ++++++-----
 ipfs_lite/ipld/ipld_node.hpp                  | 63 +++++++++----
 6 files changed, 128 insertions(+), 162 deletions(-)
 delete mode 100644 ipfs_lite/ipld/impl/ipld_node_impl.hpp
 rename ipfs_lite/ipld/{impl/ipld_node_impl.cpp => ipld_node.cpp} (64%)

diff --git a/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.cpp b/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.cpp
index 703f527..9e08dcc 100644
--- a/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.cpp
+++ b/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.cpp
@@ -2,17 +2,16 @@
 
 #include <boost/assert.hpp>
 
-#include "ipfs_lite/ipld/impl/ipld_node_impl.hpp"
+#include "ipfs_lite/ipld/ipld_node.hpp"
 
 namespace sgns::ipfs_lite::ipfs::merkledag {
-  using ipld::IPLDNodeImpl;
+using ipld::IPLDNode;
 
-  MerkleDagServiceImpl::MerkleDagServiceImpl(
-      std::shared_ptr<IpfsDatastore> service)
-      : block_service_{std::move(service)} {
+MerkleDagServiceImpl::MerkleDagServiceImpl(std::shared_ptr<IpfsDatastore> service):
+    block_service_{std::move(service)} {
     BOOST_ASSERT_MSG(block_service_ != nullptr,
                      "MerkleDAG service: Block service not connected");
-  }
+}
 
   IPFS::outcome::result<void> MerkleDagServiceImpl::addNode(
       std::shared_ptr<const IPLDNode> node) {
@@ -22,8 +21,8 @@ namespace sgns::ipfs_lite::ipfs::merkledag {
 
   IPFS::outcome::result<std::shared_ptr<IPLDNode>> MerkleDagServiceImpl::getNode(
       const CID &cid) const {
-    OUTCOME_TRY((auto &&, content), block_service_->get(cid));
-    return IPLDNodeImpl::createFromRawBytes(content);
+      BOOST_OUTCOME_TRY(auto&& content, block_service_->get(cid));
+      return IPLDNode::createFromRawBytes(content);
   }
 
   IPFS::outcome::result<void> MerkleDagServiceImpl::removeNode(const CID &cid) {
@@ -35,20 +34,26 @@ namespace sgns::ipfs_lite::ipfs::merkledag {
       gsl::span<const uint8_t> selector,
       std::function<bool(std::shared_ptr<const IPLDNode>)> handler) const {
     std::ignore = selector;
-    OUTCOME_TRY((auto &&, cid), CID::fromBytes(root_cid));
-    OUTCOME_TRY((auto &&, root_node), getNode(cid));
+    BOOST_OUTCOME_TRY(auto&& cid, CID::fromBytes(root_cid));
+    BOOST_OUTCOME_TRY(auto&& root_node, getNode(cid));
     std::vector<std::shared_ptr<const IPLDNode>> node_set{};
     node_set.emplace_back(std::move(root_node));
+
     const auto &links = node_set.front()->getLinks();
     for (const auto &link : links) {
       auto request = getNode(link.get().getCID());
-      if (request.has_error()) return ServiceError::UNRESOLVED_LINK;
+      if (request.has_error()) {
+          return ServiceError::UNRESOLVED_LINK;
+      }
       node_set.emplace_back(std::move(request.value()));
     }
+
     size_t sent_count{};
     for (const auto &node : node_set) {
       ++sent_count;
-      if (!handler(node)) break;
+      if (!handler(node)) {
+          break;
+      }
     }
     return sent_count;
   }
@@ -68,42 +73,48 @@ namespace sgns::ipfs_lite::ipfs::merkledag {
       std::function<IPFS::outcome::result<std::shared_ptr<IPLDNode>>(const CID& cid)> nodeGetter,
       const CID& cid, std::optional<uint64_t> depth)
   {
-      OUTCOME_TRY((auto &&, node), nodeGetter(cid));
+      BOOST_OUTCOME_TRY(auto&& node, nodeGetter(cid));
       auto leaf = std::make_shared<Leaf>(node->content());
-      auto result = buildGraph(nodeGetter, leaf, node->getLinks(), depth, 0);
-      if (result.has_error()) return result.error();
+      auto result = buildGraph(nodeGetter, *leaf, node->getLinks(), depth, 0);
+      if (result.has_error()) {
+          return result.error();
+      }
       return leaf;
   }
 
   IPFS::outcome::result<void> MerkleDagServiceImpl::buildGraph(
       std::function<IPFS::outcome::result<std::shared_ptr<IPLDNode>>(const CID& cid)> nodeGetter,
-      const std::shared_ptr<Leaf> &root,
-      const std::vector<std::reference_wrapper<const IPLDLink>> &links,
+      Leaf& root,
+      const std::vector<std::reference_wrapper<const IPLDLink>>& links,
       std::optional<size_t> max_depth,
-      size_t current_depth) {
-    if (max_depth && current_depth == *max_depth) {
-      return IPFS::outcome::success();
-    }
-    for (const auto &link : links) {
-      auto request = nodeGetter(link.get().getCID());
-      if (request.has_error()) return ServiceError::UNRESOLVED_LINK;
-      std::shared_ptr<IPLDNode> node = request.value();
-      auto child_leaf = std::make_shared<Leaf>(node->content());
-      auto build_result = buildGraph(nodeGetter,
-                                     child_leaf,
-                                     node->getLinks(),
-                                     max_depth,
-                                     current_depth + 1);
-      if (build_result.has_error()) {
-        return build_result;
+      size_t current_depth
+  ) {
+      if (max_depth && current_depth == *max_depth) {
+          return IPFS::outcome::success();
       }
-      auto insert_result =
-          root->insertSubLeaf(link.get().getName(), std::move(*child_leaf));
-      if (insert_result.has_error()) {
-        return insert_result;
+
+      for (const auto& link : links) {
+          auto request = nodeGetter(link.get().getCID());
+          if (request.has_error()) {
+              return ServiceError::UNRESOLVED_LINK;
+          }
+
+          auto node = request.value();
+          auto child_leaf = std::make_shared<Leaf>(node->content());
+          auto build_result =
+              buildGraph(nodeGetter, *child_leaf, node->getLinks(), max_depth, current_depth + 1);
+
+          if (build_result.has_error()) {
+              return build_result;
+          }
+          
+          auto insert_result = root.insertSubLeaf(link.get().getName(), *child_leaf);
+          if (insert_result.has_error()) {
+              return insert_result;
+          }
       }
-    }
-    return IPFS::outcome::success();
+
+      return IPFS::outcome::success();
   }
 }  // namespace sgns::ipfs_lite::ipfs::merkledag
 
diff --git a/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.hpp b/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.hpp
index f5e3bae..7a4ec4e 100644
--- a/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.hpp
+++ b/ipfs_lite/ipfs/merkledag/impl/merkledag_service_impl.hpp
@@ -65,10 +65,11 @@ namespace sgns::ipfs_lite::ipfs::merkledag {
      */
     static IPFS::outcome::result<void> buildGraph(
         std::function<IPFS::outcome::result<std::shared_ptr<IPLDNode>>(const CID& cid)> nodeGetter,
-        const std::shared_ptr<Leaf> &root,
-        const std::vector<std::reference_wrapper<const IPLDLink>> &links,
+        Leaf& root,
+        const std::vector<std::reference_wrapper<const IPLDLink>>& links,
         std::optional<size_t> max_depth,
-        size_t current_depth = 0);
+        size_t current_depth = 0
+    );
   };
 }  // namespace sgns::ipfs_lite::ipfs::merkledag
 
diff --git a/ipfs_lite/ipld/CMakeLists.txt b/ipfs_lite/ipld/CMakeLists.txt
index b430204..be5d0a7 100644
--- a/ipfs_lite/ipld/CMakeLists.txt
+++ b/ipfs_lite/ipld/CMakeLists.txt
@@ -8,7 +8,7 @@ target_link_libraries(ipld_block INTERFACE
     )
 
 add_library(ipld_node
-    impl/ipld_node_impl.cpp
+    ipld_node.cpp
     impl/ipld_node_encoder_pb.cpp
     impl/ipld_node_decoder_pb.cpp
     )
diff --git a/ipfs_lite/ipld/impl/ipld_node_impl.hpp b/ipfs_lite/ipld/impl/ipld_node_impl.hpp
deleted file mode 100644
index cf2fc27..0000000
--- a/ipfs_lite/ipld/impl/ipld_node_impl.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-
-#ifndef IPFS_LITE_IPLD_NODE_IMPL_HPP
-#define IPFS_LITE_IPLD_NODE_IMPL_HPP
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include <boost/optional.hpp>
-#include "ipfs_lite/ipld/ipld_link.hpp"
-#include "ipfs_lite/ipld/ipld_block.hpp"
-#include "ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp"
-#include "ipfs_lite/ipld/ipld_node.hpp"
-
-namespace sgns::ipfs_lite::ipld {
-  class IPLDNodeImpl : public IPLDNode {
-   public:
-    const CID &getCID() const override;
-
-    const Buffer &getRawBytes() const override;
-
-    size_t size() const override;
-
-    void assign(common::Buffer input) override;
-
-    const common::Buffer &content() const override;
-
-    IPFS::outcome::result<void> addChild(
-        const std::string &name, std::shared_ptr<const IPLDNode> node) override;
-
-    IPFS::outcome::result<std::reference_wrapper<const IPLDLink>> getLink(
-        const std::string &name) const override;
-
-    void removeLink(const std::string &name) override;
-
-    void addLink(IPLDLink link) override {
-        links_.emplace(link.getName(), link);
-    }
-
-    std::vector<std::reference_wrapper<const IPLDLink>> getLinks()
-        const override;
-
-    Buffer serialize() const override;
-
-    static std::shared_ptr<IPLDNode> createFromString(
-        const std::string &content);
-
-    static IPFS::outcome::result<std::shared_ptr<IPLDNode>> createFromRawBytes(
-        gsl::span<const uint8_t> input);
-
-    const IPLDBlock &getIPLDBlock() const;
-
-   private:
-    common::Buffer content_;
-    std::map<std::string, IPLDLink> links_;
-    IPLDNodeEncoderPB pb_node_codec_;
-    size_t child_nodes_size_{};
-    mutable boost::optional<IPLDBlock> ipld_block_;
-  };
-
-  template <>
-  inline IPLDType IPLDBlock::getType<IPLDNodeImpl>() {
-    return {IPLDType::Version::V0,
-            IPLDType::Content::DAG_PB,
-            IPLDType::Hash::sha256};
-  }
-
-  template <>
-  inline common::Buffer IPLDBlock::serialize<IPLDNodeImpl>(
-      const IPLDNodeImpl &entity) {
-    return entity.serialize();
-  }
-}  // namespace sgns::ipfs_lite::ipld
-
-#endif
diff --git a/ipfs_lite/ipld/impl/ipld_node_impl.cpp b/ipfs_lite/ipld/ipld_node.cpp
similarity index 64%
rename from ipfs_lite/ipld/impl/ipld_node_impl.cpp
rename to ipfs_lite/ipld/ipld_node.cpp
index 5b3fdd4..a96df4d 100644
--- a/ipfs_lite/ipld/impl/ipld_node_impl.cpp
+++ b/ipfs_lite/ipld/ipld_node.cpp
@@ -1,46 +1,37 @@
-
-#include "ipfs_lite/ipld/impl/ipld_node_impl.hpp"
+#include "ipld_node.hpp"
 
 #include "ipfs_lite/ipld/impl/ipld_node_decoder_pb.hpp"
 #include "ipfs_lite/ipld/impl/protobuf/ipld_node.pb.h"
 
-using protobuf::ipld::node::PBLink;
-using protobuf::ipld::node::PBNode;
-
 namespace sgns::ipfs_lite::ipld {
 
-  const CID &IPLDNodeImpl::getCID() const {
+  const CID &IPLDNode::getCID() const {
     return getIPLDBlock().cid;
   }
 
-  const IPLDNode::Buffer &IPLDNodeImpl::getRawBytes() const {
+  const IPLDNode::Buffer &IPLDNode::getRawBytes() const {
     return getIPLDBlock().bytes;
   }
 
-  size_t IPLDNodeImpl::size() const {
+  size_t IPLDNode::size() const {
     return getRawBytes().size() + child_nodes_size_;
   }
 
-  void IPLDNodeImpl::assign(common::Buffer input) {
+  void IPLDNode::assign(common::Buffer input) {
     content_ = std::move(input);
-    ipld_block_ =
-        boost::none;  // Need to recalculate CID after changing Node content
-  }
-
-  const common::Buffer &IPLDNodeImpl::content() const {
-    return content_;
+    ipld_block_ = std::nullopt;  // Need to recalculate CID after changing Node content
   }
 
-  IPFS::outcome::result<void> IPLDNodeImpl::addChild(
-      const std::string &name, std::shared_ptr<const IPLDNode> node) {
-      IPLDLink link{node->getCID(), name, node->size()};
+  IPFS::outcome::result<void> IPLDNode::addChild(
+      const std::string &name, const IPLDNode& node) {
+      IPLDLink link{node.getCID(), name, node.size()};
       links_.emplace(name, std::move(link));
-      ipld_block_ = boost::none; // Need to recalculate CID after adding link to child node
-      child_nodes_size_ += node->size();
+      ipld_block_ = std::nullopt; // Need to recalculate CID after adding link to child node
+      child_nodes_size_ += node.size();
       return IPFS::outcome::success();
   }
 
-  IPFS::outcome::result<std::reference_wrapper<const IPLDLink>> IPLDNodeImpl::getLink(
+  IPFS::outcome::result<std::reference_wrapper<const IPLDLink>> IPLDNode::getLink(
       const std::string &name) const {
     if (auto index = links_.find(name); index != links_.end()) {
       return index->second;
@@ -48,35 +39,40 @@ namespace sgns::ipfs_lite::ipld {
     return IPLDNodeError::LINK_NOT_FOUND;
   }
 
-  void IPLDNodeImpl::removeLink(const std::string &link_name) {
+  void IPLDNode::removeLink(const std::string &link_name) {
     if (auto index = links_.find(link_name); index != links_.end()) {
       child_nodes_size_ -= index->second.getSize();
       links_.erase(index);
     }
   }
 
-  std::vector<std::reference_wrapper<const IPLDLink>> IPLDNodeImpl::getLinks()
+  void IPLDNode::addLink(IPLDLink link) {
+    links_.emplace(link.getName(), std::move(link));
+  }
+
+  std::vector<std::reference_wrapper<const IPLDLink>> IPLDNode::getLinks()
       const {
     std::vector<std::reference_wrapper<const IPLDLink>> link_refs{};
+    link_refs.reserve(links_.size());
     for (const auto &link : links_) {
       link_refs.emplace_back(link.second);
     }
     return link_refs;
   }
 
-  IPLDNode::Buffer IPLDNodeImpl::serialize() const {
+  IPLDNode::Buffer IPLDNode::serialize() const {
     return Buffer{IPLDNodeEncoderPB::encode(content_, links_)};
   }
 
-  std::shared_ptr<IPLDNode> IPLDNodeImpl::createFromString(
+  std::shared_ptr<IPLDNode> IPLDNode::createFromString(
       const std::string &content) {
     std::vector<uint8_t> data{content.begin(), content.end()};
-    auto node = std::make_shared<IPLDNodeImpl>();
+    auto node = std::make_shared<IPLDNode>();
     node->assign(common::Buffer{data});
     return node;
   }
 
-  IPFS::outcome::result<std::shared_ptr<IPLDNode>> IPLDNodeImpl::createFromRawBytes(
+  IPFS::outcome::result<std::shared_ptr<IPLDNode>> IPLDNode::createFromRawBytes(
       gsl::span<const uint8_t> input) {
     IPLDNodeDecoderPB decoder;
     if (auto result = decoder.pb_node_.ParseFromArray(input.data(), input.size()); !result) {
@@ -87,14 +83,14 @@ namespace sgns::ipfs_lite::ipld {
     for (size_t i = 0; i < decoder.getLinksCount(); ++i) {
       std::vector<uint8_t> link_cid_bytes{decoder.getLinkCID(i).begin(),
                                           decoder.getLinkCID(i).end()};
-      OUTCOME_TRY((auto &&, link_cid), CID::fromBytes(link_cid_bytes));
+      BOOST_OUTCOME_TRY(auto && link_cid, CID::fromBytes(link_cid_bytes));
       IPLDLink link{std::move(link_cid), decoder.getLinkName(i), decoder.getLinkSize(i)};
       node->addLink(link);
     }
     return node;
   }
 
-  const IPLDBlock &IPLDNodeImpl::getIPLDBlock() const {
+  const IPLDBlock &IPLDNode::getIPLDBlock() const {
     if (!ipld_block_) {
       ipld_block_ = IPLDBlock::create(*this);
     }
diff --git a/ipfs_lite/ipld/ipld_node.hpp b/ipfs_lite/ipld/ipld_node.hpp
index 30416f7..d141f2a 100644
--- a/ipfs_lite/ipld/ipld_node.hpp
+++ b/ipfs_lite/ipld/ipld_node.hpp
@@ -5,10 +5,13 @@
 #include <memory>
 #include <string>
 #include <vector>
+#include <optional>
 
 #include "common/buffer.hpp"
 #include "common/outcome.hpp"
 
+#include "ipfs_lite/ipld/impl/ipld_node_encoder_pb.hpp"
+#include "ipfs_lite/ipld/ipld_block.hpp"
 #include "ipfs_lite/ipld/ipld_link.hpp"
 
 namespace sgns::ipfs_lite::ipld {
@@ -20,13 +23,13 @@ namespace sgns::ipfs_lite::ipld {
     using Buffer = common::Buffer;
 
    public:
-    virtual ~IPLDNode() = default;
+    ~IPLDNode() = default;
 
     /**
      * @brief Get node's CID
      * @return node's CID
      */
-    virtual const CID &getCID() const = 0;
+    const CID &getCID() const;
 
     /**
      * @brief Get serialized node's content
@@ -34,26 +37,28 @@ namespace sgns::ipfs_lite::ipld {
      * cache for each query
      * @return node raw bytes
      */
-    virtual const Buffer &getRawBytes() const = 0;
+    const Buffer &getRawBytes() const;
 
     /**
      * @brief Total size of the data including the total sizes of references
      * @return Cumulative size in bytes
      */
-    virtual size_t size() const = 0;
+    size_t size() const;
 
     /**
      * @brief Assign Node's content
      * @param input - data bytes
      * @return operation result
      */
-    virtual void assign(Buffer input) = 0;
+    void assign(Buffer input);
 
     /**
      * @brief Get Node data
      * @return content bytes
      */
-    virtual const Buffer &content() const = 0;
+    const Buffer &content() const {
+        return content_;
+    }
 
     /**
      * @brief Add link to the child node
@@ -61,48 +66,76 @@ namespace sgns::ipfs_lite::ipld {
      * @param node - child object to link
      * @return operation result
      */
-    virtual IPFS::outcome::result<void> addChild(
-        const std::string &name, std::shared_ptr<const IPLDNode> node) = 0;
+    IPFS::outcome::result<void> addChild(
+        const std::string &name, const IPLDNode& node);
 
     /**
      * @brief Get particular link to the child node
      * @param name - id of the link
      * @return Requested link of error, if link not found
      */
-    virtual IPFS::outcome::result<std::reference_wrapper<const IPLDLink>> getLink(
-        const std::string &name) const = 0;
+    IPFS::outcome::result<std::reference_wrapper<const IPLDLink>> getLink(
+        const std::string &name) const;
 
     /**
      * @brief Remove link to the child node
      * @param name - name of the child node
      * @return operation result
      */
-    virtual void removeLink(const std::string &name) = 0;
+    void removeLink(const std::string &name);
 
     /**
      * @brief Insert link to the child node
      * @param link - object to add
      */
-    virtual void addLink(IPLDLink link) = 0;
+    void addLink(IPLDLink link);
 
     /**
      * @brief Get links to first-level child nodes
      * @return References to node links
      */
-    virtual std::vector<std::reference_wrapper<const IPLDLink>> getLinks()
-        const = 0;
+    std::vector<std::reference_wrapper<const IPLDLink>> getLinks()
+        const;
 
     /**
      * @brief Serialize Node
      * @return raw bytes
      */
-    virtual Buffer serialize() const = 0;
+    Buffer serialize() const;
+
+    static std::shared_ptr<IPLDNode> createFromString(
+        const std::string &content);
+
+    static IPFS::outcome::result<std::shared_ptr<IPLDNode>> createFromRawBytes(
+        gsl::span<const uint8_t> input);
+
+    const IPLDBlock &getIPLDBlock() const;
+
+   private:
+    common::Buffer content_;
+    std::map<std::string, IPLDLink> links_;
+    IPLDNodeEncoderPB pb_node_codec_;
+    size_t child_nodes_size_{};
+    mutable std::optional<IPLDBlock> ipld_block_;
   };
 
   /**
    * @class Possible Node errors
    */
   enum class IPLDNodeError { LINK_NOT_FOUND = 1, INVALID_RAW_DATA };
+
+  template <>
+  inline IPLDType IPLDBlock::getType<IPLDNode>() {
+    return {IPLDType::Version::V0,
+            IPLDType::Content::DAG_PB,
+            IPLDType::Hash::sha256};
+  }
+
+  template <>
+  inline common::Buffer IPLDBlock::serialize<IPLDNode>(
+      const IPLDNode &entity) {
+    return entity.serialize();
+  }
 }  // namespace sgns::ipfs_lite::ipld
 
 OUTCOME_HPP_DECLARE_ERROR_2(sgns::ipfs_lite::ipld, IPLDNodeError)

From ecfafac849b79a079ca1aae2046ed61fdcfebdb7 Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Wed, 28 May 2025 08:54:25 -0300
Subject: [PATCH 16/17] Removed unused walker class

---
 ipfs_lite/face/map_cursor.hpp |   1 -
 ipfs_lite/ipld/CMakeLists.txt |  14 +----
 ipfs_lite/ipld/walker.cpp     | 103 ----------------------------------
 ipfs_lite/ipld/walker.hpp     |  31 ----------
 4 files changed, 2 insertions(+), 147 deletions(-)
 delete mode 100644 ipfs_lite/ipld/walker.cpp
 delete mode 100644 ipfs_lite/ipld/walker.hpp

diff --git a/ipfs_lite/face/map_cursor.hpp b/ipfs_lite/face/map_cursor.hpp
index 2ca223d..3cd1174 100644
--- a/ipfs_lite/face/map_cursor.hpp
+++ b/ipfs_lite/face/map_cursor.hpp
@@ -1,4 +1,3 @@
-
 #ifndef CPP_IPFS_LITE_MAP_CURSOR_HPP
 #define CPP_IPFS_LITE_MAP_CURSOR_HPP
 
diff --git a/ipfs_lite/ipld/CMakeLists.txt b/ipfs_lite/ipld/CMakeLists.txt
index be5d0a7..646d9cd 100644
--- a/ipfs_lite/ipld/CMakeLists.txt
+++ b/ipfs_lite/ipld/CMakeLists.txt
@@ -5,13 +5,13 @@ add_library(ipld_block INTERFACE)
 target_link_libraries(ipld_block INTERFACE
     cid
     ipfs_lite_hasher
-    )
+)
 
 add_library(ipld_node
     ipld_node.cpp
     impl/ipld_node_encoder_pb.cpp
     impl/ipld_node_decoder_pb.cpp
-    )
+)
 
 target_link_libraries(ipld_node
     ipld_node_protobuf
@@ -20,13 +20,3 @@ target_link_libraries(ipld_node
     cid
     cbor
 )
-
-add_library(ipld_walker
-    walker.cpp
-    )
-
-target_link_libraries(ipld_walker
-    ipld_node_protobuf
-    cbor
-    logger
-    )
diff --git a/ipfs_lite/ipld/walker.cpp b/ipfs_lite/ipld/walker.cpp
deleted file mode 100644
index 9dcc5a9..0000000
--- a/ipfs_lite/ipld/walker.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-#include "ipfs_lite/ipld/walker.hpp"
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-
-namespace sgns::ipfs_lite::ipld::walker {
-  using google::protobuf::io::CodedInputStream;
-  using Input = gsl::span<const uint8_t>;
-
-  struct PbDecoder {
-    PbDecoder(Input input) : input{input}, cs(input.data(), input.size()) {}
-
-    Input _str(uint64_t id) {
-      if (cs.ExpectTag((id << 3) | 2)) {
-        int size;
-        if (cs.ReadVarintSizeAsInt(&size)) {
-          auto offset = cs.CurrentPosition();
-          if (cs.Skip(size)) {
-            return input.subspan(offset, size);
-          }
-        }
-      }
-      return {};
-    }
-
-    bool empty() {
-      return cs.CurrentPosition() >= input.size();
-    }
-
-    Input input;
-    CodedInputStream cs;
-  };
-
-  struct PbNodeDecoder {
-    static IPFS::outcome::result<std::vector<CID>> links(
-        gsl::span<const uint8_t> input) {
-      std::vector<CID> cids;
-      PbDecoder s{input};
-      while (true) {
-        PbDecoder link{s._str(2)};
-        if (link.empty()) {
-          break;
-        }
-        auto cid_bytes = link._str(1);
-        OUTCOME_TRY((auto &&, cid), CID::fromBytes(cid_bytes));
-        cids.push_back(std::move(cid));
-      }
-      return std::move(cids);
-    }
-  };
-
-  IPFS::outcome::result<void> Walker::select(const CID &root,
-                                       const Selector &selector) {
-    // TODO(turuslan): implement selectors
-    return recursiveAll(root);
-  }
-
-  IPFS::outcome::result<void> Walker::recursiveAll(const CID &cid) {
-    if (visited.insert(cid).second) {
-      cids.push_back(cid);
-      OUTCOME_TRY((auto &&, bytes), store.get(cid));
-      // TODO(turuslan): what about other types?
-      if (cid.content_type == libp2p::multi::MulticodecType::Code::DAG_CBOR) {
-        try {
-          CborDecodeStream s{bytes};
-          recursiveAll(s);
-        } catch (std::system_error &e) {
-          return IPFS::outcome::failure(e.code());
-        }
-      } else if (cid.content_type == libp2p::multi::MulticodecType::Code::DAG_PB) {
-        OUTCOME_TRY((auto &&, cids), PbNodeDecoder::links(bytes));
-        for (auto &cid : cids) {
-          BOOST_OUTCOME_TRYV2(auto &&, recursiveAll(cid));
-        }
-      }
-    }
-    return IPFS::outcome::success();
-  }
-
-  void Walker::recursiveAll(CborDecodeStream &s) {
-    if (s.isCid()) {
-      CID cid;
-      s >> cid;
-      auto result = recursiveAll(cid);
-      if (!result) {
-        IPFS::outcome::raise(result.error());
-      }
-    } else if (s.isList()) {
-      auto n = s.listLength();
-      for (auto l = s.list(); n != 0; --n) {
-        recursiveAll(l);
-      }
-    } else if (s.isMap()) {
-      for (auto &p : s.map()) {
-        recursiveAll(p.second);
-      }
-    } else {
-      s.next();
-    }
-  }
-}  // namespace sgns::ipfs_lite::ipld::walker
diff --git a/ipfs_lite/ipld/walker.hpp b/ipfs_lite/ipld/walker.hpp
deleted file mode 100644
index b382e7e..0000000
--- a/ipfs_lite/ipld/walker.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#ifndef CPP_IPFS_LITE_STORAGE_IPLD_WALKER_HPP
-#define CPP_IPFS_LITE_STORAGE_IPLD_WALKER_HPP
-
-#include <set>
-
-#include "ipfs_lite/ipfs/datastore.hpp"
-
-namespace sgns::ipfs_lite::ipld::walker {
-  using codec::cbor::CborDecodeStream;
-  using Ipld = ipfs::IpfsDatastore;
-
-  // TODO(turuslan): implement selectors
-  struct Selector {};
-
-  struct Walker {
-    Walker(Ipld &store) : store{store} {}
-
-    IPFS::outcome::result<void> select(const CID &root, const Selector &selector);
-
-    IPFS::outcome::result<void> recursiveAll(const CID &cid);
-
-    void recursiveAll(CborDecodeStream &s);
-
-    Ipld &store;
-    std::set<CID> visited;
-    std::vector<CID> cids;
-  };
-}  // namespace sgns::ipfs_lite::ipld::walker
-
-#endif  // CPP_IPFS_LITE_STORAGE_IPLD_WALKER_HPP

From fe8538f529e5d5c2a91920d7bc5bb8d20990c87f Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Thu, 29 May 2025 08:38:49 -0300
Subject: [PATCH 17/17] Removed unused BigInt and tests

---
 codec/cbor/cbor.hpp                        |  1 -
 ipfs_lite/ipfs/datastore.hpp               |  4 --
 ipfs_lite/ipfs/merkledag/leaf.hpp          |  1 -
 ipfs_lite/rocksdb/rocksdb_util.hpp         |  6 +--
 primitives/big_int.hpp                     | 38 ---------------
 primitives/cid/cid_of_cbor.hpp             | 23 ---------
 test/core/codec/cbor/cbor_test.cpp         | 12 -----
 test/core/primitives/CMakeLists.txt        |  8 ----
 test/core/primitives/big_int_test.cpp      | 47 ------------------
 test/core/primitives/cid/CMakeLists.txt    |  8 ----
 test/core/primitives/cid/cid_json_test.cpp | 56 ----------------------
 11 files changed, 3 insertions(+), 201 deletions(-)
 delete mode 100644 primitives/big_int.hpp
 delete mode 100644 primitives/cid/cid_of_cbor.hpp
 delete mode 100644 test/core/primitives/CMakeLists.txt
 delete mode 100644 test/core/primitives/big_int_test.cpp
 delete mode 100644 test/core/primitives/cid/CMakeLists.txt
 delete mode 100644 test/core/primitives/cid/cid_json_test.cpp

diff --git a/codec/cbor/cbor.hpp b/codec/cbor/cbor.hpp
index e2b767d..90ddfae 100644
--- a/codec/cbor/cbor.hpp
+++ b/codec/cbor/cbor.hpp
@@ -3,7 +3,6 @@
 
 #include "codec/cbor/cbor_decode_stream.hpp"
 #include "codec/cbor/cbor_encode_stream.hpp"
-#include "codec/cbor/cbor_resolve.hpp"
 #include "common/buffer.hpp"
 
 namespace sgns::codec::cbor {
diff --git a/ipfs_lite/ipfs/datastore.hpp b/ipfs_lite/ipfs/datastore.hpp
index 18751e4..4ed107e 100644
--- a/ipfs_lite/ipfs/datastore.hpp
+++ b/ipfs_lite/ipfs/datastore.hpp
@@ -2,14 +2,10 @@
 #ifndef CPP_IPFS_LITE_IPFS_DATASTORE_HPP
 #define CPP_IPFS_LITE_IPFS_DATASTORE_HPP
 
-#include <vector>
-
 #include "codec/cbor/cbor.hpp"
 #include "common/buffer.hpp"
-#include "common/logger.hpp"
 #include "common/outcome.hpp"
 #include "primitives/cid/cid.hpp"
-#include "ipfs_lite/ipfs/ipfs_datastore_error.hpp"
 
 namespace sgns::ipfs_lite::ipfs {
 
diff --git a/ipfs_lite/ipfs/merkledag/leaf.hpp b/ipfs_lite/ipfs/merkledag/leaf.hpp
index f5aebf1..0b1c6bf 100644
--- a/ipfs_lite/ipfs/merkledag/leaf.hpp
+++ b/ipfs_lite/ipfs/merkledag/leaf.hpp
@@ -59,7 +59,6 @@ class Leaf {
     [[nodiscard]] IPFS::outcome::result<std::reference_wrapper<const Leaf>> subLeaf(
         std::string_view name
     ) const {
-
         if (auto iter = children_.find(name); iter != children_.end()) {
             return iter->second;
         }
diff --git a/ipfs_lite/rocksdb/rocksdb_util.hpp b/ipfs_lite/rocksdb/rocksdb_util.hpp
index 4f87aaf..efb94f3 100644
--- a/ipfs_lite/rocksdb/rocksdb_util.hpp
+++ b/ipfs_lite/rocksdb/rocksdb_util.hpp
@@ -11,7 +11,7 @@
 namespace sgns::ipfs_lite {
 
   template <typename T>
-  inline IPFS::outcome::result<T> error_as_result(const ::ROCKSDB_NAMESPACE::Status &s) {
+  IPFS::outcome::result<T> error_as_result(const ::ROCKSDB_NAMESPACE::Status &s) {
     if (s.IsNotFound()) {
       return rocksdbError::NOT_FOUND;
     }
@@ -36,7 +36,7 @@ namespace sgns::ipfs_lite {
   }
 
   template <typename T>
-  inline IPFS::outcome::result<T> error_as_result(const ::ROCKSDB_NAMESPACE::Status &s,
+  IPFS::outcome::result<T> error_as_result(const ::ROCKSDB_NAMESPACE::Status &s,
                                             const common::Logger &logger) {
     // if we are checking if it exists, don't log as an error
     if (s.IsNotFound()) {
@@ -64,7 +64,7 @@ namespace sgns::ipfs_lite {
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
     const auto *ptr = reinterpret_cast<const uint8_t *>(s.data());
     // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
-    return common::Buffer(ptr, ptr + s.size());
+    return {ptr, ptr + s.size()};
   }
 
 }  // namespace sgns::ipfs_lite
diff --git a/primitives/big_int.hpp b/primitives/big_int.hpp
deleted file mode 100644
index 9e78902..0000000
--- a/primitives/big_int.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#ifndef CPP_IPFS_LITE_PRIMITIVES_BIG_INT_HPP
-#define CPP_IPFS_LITE_PRIMITIVES_BIG_INT_HPP
-
-#include <boost/multiprecision/cpp_int.hpp>
-
-#include "codec/cbor/streams_annotation.hpp"
-
-namespace sgns::primitives {
-  using BigInt = boost::multiprecision::cpp_int;
-}  // namespace sgns::primitives
-
-namespace boost::multiprecision {
-  CBOR_ENCODE(cpp_int, big_int) {
-    std::vector<uint8_t> bytes;
-    if (big_int != 0) {
-      bytes.push_back(big_int < 0 ? 1 : 0);
-      export_bits(big_int, std::back_inserter(bytes), 8);
-    }
-    return s << bytes;
-  }
-
-  CBOR_DECODE(cpp_int, big_int) {
-    std::vector<uint8_t> bytes;
-    s >> bytes;
-    if (bytes.empty()) {
-      big_int = 0;
-    } else {
-      import_bits(big_int, bytes.begin() + 1, bytes.end());
-      if (bytes[0] == 1) {
-        big_int = -big_int;
-      }
-    }
-    return s;
-  }
-}  // namespace boost::multiprecision
-
-#endif  // CPP_IPFS_LITE_PRIMITIVES_BIG_INT_HPP
diff --git a/primitives/cid/cid_of_cbor.hpp b/primitives/cid/cid_of_cbor.hpp
deleted file mode 100644
index 9a27ac2..0000000
--- a/primitives/cid/cid_of_cbor.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#ifndef CPP_IPFS_LITE__PRIMITIVES_CID_CID_OF_CBOR_HPP
-#define CPP_IPFS_LITE__PRIMITIVES_CID_CID_OF_CBOR_HPP
-
-#include "primitives/cid/cid.hpp"
-#include "codec/cbor/cbor.hpp"
-
-namespace sgns::primitives::cid {
-
-  /**
-   * @brief helper function to calculate cid of an object
-   * @tparam T object type
-   * @param value object instance reference
-   * @return calculated cid or error
-   */
-  template <class T>
-  IPFS::outcome::result<CID> getCidOfCbor(const T &value) {
-    OUTCOME_TRY((auto &&, bytes), sgns::codec::cbor::encode(value));
-    return common::getCidOf(bytes);
-  }
-}  // namespace sgns::primitives::cid
-
-#endif  // CPP_IPFS_LITE__PRIMITIVES_CID_CID_OF_CBOR_HPP
diff --git a/test/core/codec/cbor/cbor_test.cpp b/test/core/codec/cbor/cbor_test.cpp
index 1e9d796..64292c3 100644
--- a/test/core/codec/cbor/cbor_test.cpp
+++ b/test/core/codec/cbor/cbor_test.cpp
@@ -3,7 +3,6 @@
 #include "primitives/big_int.hpp"
 
 #include <gtest/gtest.h>
-#include "primitives/cid/cid.hpp"
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"
 #include <boost/optional/optional_io.hpp>
@@ -49,17 +48,6 @@ TEST(Cbor, DecodeBlob) {
                     Blob3::fromHex("CAFEDE").value());
 }
 
-/** BigInt CBOR encoding and decoding */
-TEST(Cbor, BigInt) {
-  using sgns::primitives::BigInt;
-  EXPECT_OUTCOME_EQ(encode(BigInt(0xCAFE)), "4300CAFE"_unhex);
-  EXPECT_OUTCOME_EQ(decode<BigInt>("4300CAFE"_unhex), 0xCAFE);
-  EXPECT_OUTCOME_EQ(encode(BigInt(-0xCAFE)), "4301CAFE"_unhex);
-  EXPECT_OUTCOME_EQ(decode<BigInt>("4301CAFE"_unhex), -0xCAFE);
-  EXPECT_OUTCOME_EQ(encode(BigInt(0)), "40"_unhex);
-  EXPECT_OUTCOME_EQ(decode<BigInt>("40"_unhex), 0);
-}
-
 /** Null CBOR encoding and decoding */
 TEST(Cbor, Null) {
   EXPECT_OUTCOME_EQ(encode(nullptr), "F6"_unhex);
diff --git a/test/core/primitives/CMakeLists.txt b/test/core/primitives/CMakeLists.txt
deleted file mode 100644
index 4018d03..0000000
--- a/test/core/primitives/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-add_subdirectory(cid)
-addtest(big_int_test
-big_int_test.cpp
-)
-target_link_libraries(big_int_test
-Boost::boost
-)
\ No newline at end of file
diff --git a/test/core/primitives/big_int_test.cpp b/test/core/primitives/big_int_test.cpp
deleted file mode 100644
index 5667a60..0000000
--- a/test/core/primitives/big_int_test.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-#include "primitives/big_int.hpp"
-
-#include <gtest/gtest.h>
-
-using sgns::primitives::BigInt;
-
-/**
- * Test arithmetis over BigInt types
- */
-
-TEST(BigInt, Equality) {
-  BigInt a{2};
-  BigInt b{2};
-  ASSERT_TRUE(a == b);
-  ASSERT_TRUE(a == a);
-}
-
-TEST(BigInt, SelfMultiply) {
-  BigInt a{2};
-  a *= BigInt{3};
-  ASSERT_EQ(a, BigInt{6});
-}
-
-TEST(BigInt, Multiply) {
-  BigInt a{2};
-  BigInt b{3};
-  ASSERT_EQ(a * b, BigInt{6});
-}
-
-TEST(BigInt, SelfDivide) {
-  BigInt a{8};
-  a /= BigInt{2};
-  ASSERT_EQ(a, BigInt{4});
-}
-
-TEST(BigInt, Divide) {
-  BigInt a{8};
-  BigInt b{2};
-  ASSERT_EQ(a / b, BigInt{4});
-}
-
-TEST(BigInt, DivideByZero) {
-  BigInt a{8};
-  BigInt b{0};
-  ASSERT_THROW(BigInt{a / b}, std::exception);
-}
diff --git a/test/core/primitives/cid/CMakeLists.txt b/test/core/primitives/cid/CMakeLists.txt
deleted file mode 100644
index b635027..0000000
--- a/test/core/primitives/cid/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# addtest(cid_json_test
-#     cid_json_test.cpp
-#     )
-# target_link_libraries(cid_json_test
-#     cid
-#     json_cid_codec
-#     )
diff --git a/test/core/primitives/cid/cid_json_test.cpp b/test/core/primitives/cid/cid_json_test.cpp
deleted file mode 100644
index cf145d4..0000000
--- a/test/core/primitives/cid/cid_json_test.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-#include "primitives/cid/json_codec.hpp"
-
-#include <gtest/gtest.h>
-#include <boost/algorithm/string.hpp>
-#include "primitives/cid/cid_of_cbor.hpp"
-#include "testutil/outcome.hpp"
-
-using namespace sgns::primitives::cid;
-
-struct CidJsonTest : public ::testing::Test {
-  void SetUp() override {
-    EXPECT_OUTCOME_TRUE(c1, getCidOfCbor(std::string("string1")));
-    EXPECT_OUTCOME_TRUE(c2, getCidOfCbor(std::string("string2")));
-    EXPECT_OUTCOME_TRUE(c3, getCidOfCbor(std::string("string3")));
-
-    cids.push_back(c1);
-    cids.push_back(c2);
-    cids.push_back(c3);
-    // clang-format off
-    json_value = "{\n"
-                 "    \"\\/\": [\n"
-                 "        \"bafy2bzacedtdowfzziuwwp4uots32j6r3ivf6ox7nsaqiv7zycgvhg5znpro4\",\n"
-                 "        \"bafy2bzaced3ejv6imv72pyz52e2d3mzpx3vck2i2mzlkzmaz767qvkvnm2k7w\",\n"
-                 "        \"bafy2bzacea3akzzddnz7elfdehxi6xzlmxqsn5bi6bm5ghncekyjzfzuyti4s\"\n"
-                 "    ]\n"
-                 "}";
-    // clang-format on
-    stripString(json_value);
-  }
-
-  void stripString(std::string &s) {
-    boost::erase_all(s, "\n");
-    boost::erase_all(s, "\t");
-    boost::erase_all(s, " ");
-  }
-
-  std::vector<sgns::CID> cids;
-  std::string json_value;
-};
-
-/**
- * @given vector of cids, predefined json value
- * @when json-encode cids using encodeCidVector function
- * @then resulting json is equal to predefined one
- * @when decode obtained json using decodeCidVector
- * @then resulting vector of cids is equal to the one given
- */
-TEST_F(CidJsonTest, EncodeAndPrint) {
-  EXPECT_OUTCOME_TRUE(value, sgns::codec::json::encodeCidVector(cids));
-  stripString(value);
-  ASSERT_EQ(value, json_value);
-  EXPECT_OUTCOME_TRUE(res, sgns::codec::json::decodeCidVector(value));
-  ASSERT_EQ(res, cids);
-}