Ipfs-cleanup

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)
@@ -73,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

codec/CMakeLists.txt

@@ -1,2 +1 @@
 add_subdirectory(cbor)
-add_subdirectory(rle)

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 {

codec/cbor/cbor_encode_stream.cpp

@@ -40,17 +40,20 @@ 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);
     data_.insert(data_.end(),
                  encoded.begin(),
                  encoded.begin()
                      + cbor_encoder_get_buffer_size(&encoder, encoded.data()));
+
     *this << cid_bytes;
     return *this;
   }

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};