Car reader and genesis (#151)

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

Author: turuslan

core/codec/cbor/cbor_decode_stream.cpp

@@ -5,8 +5,6 @@
 
 #include "codec/cbor/cbor_decode_stream.hpp"
 
-#include <libp2p/multi/content_identifier_codec.hpp>
-
 namespace fc::codec::cbor {
   CborDecodeStream::CborDecodeStream(gsl::span<const uint8_t> data)
       : data_(std::make_shared<std::vector<uint8_t>>(data.begin(), data.end())),
@@ -79,7 +77,7 @@ namespace fc::codec::cbor {
       outcome::raise(CborDecodeError::INVALID_CBOR_CID);
     }
     bytes.erase(bytes.begin());
-    auto maybe_cid = libp2p::multi::ContentIdentifierCodec::decode(bytes);
+    auto maybe_cid = CID::fromBytes(bytes);
     if (maybe_cid.has_error()) {
       outcome::raise(CborDecodeError::INVALID_CID);
     }

core/codec/cbor/cbor_encode_stream.cpp

@@ -5,8 +5,6 @@
 
 #include "codec/cbor/cbor_encode_stream.hpp"
 
-#include <libp2p/multi/content_identifier_codec.hpp>
-
 namespace fc::codec::cbor {
   CborEncodeStream &CborEncodeStream::operator<<(
       const std::vector<uint8_t> &bytes) {
@@ -42,9 +40,8 @@ namespace fc::codec::cbor {
     return *this;
   }
 
-  CborEncodeStream &CborEncodeStream::operator<<(
-      const libp2p::multi::ContentIdentifier &cid) {
-    auto maybe_cid_bytes = libp2p::multi::ContentIdentifierCodec::encode(cid);
+  CborEncodeStream &CborEncodeStream::operator<<(const CID &cid) {
+    auto maybe_cid_bytes = cid.toBytes();
     if (maybe_cid_bytes.has_error()) {
       outcome::raise(CborEncodeError::INVALID_CID);
     }

core/codec/cbor/cbor_encode_stream.hpp

@@ -97,7 +97,7 @@ namespace fc::codec::cbor {
     /** Encodes string */
     CborEncodeStream &operator<<(const std::string &str);
     /** Encodes CID */
-    CborEncodeStream &operator<<(const libp2p::multi::ContentIdentifier &cid);
+    CborEncodeStream &operator<<(const CID &cid);
     /** Encodes list container encode substream */
     CborEncodeStream &operator<<(const CborEncodeStream &other);
     /** Encodes map container encode substream map */

core/primitives/address/address_codec.cpp

@@ -21,7 +21,7 @@ namespace fc::primitives::address {
 
   using common::Blob;
   using base32 = cppcodec::base32_rfc4648;
-  using UVarint = libp2p::multi::UVarint;
+  using libp2p::multi::UVarint;
 
   std::vector<uint8_t> encode(const Address &address) noexcept {
     std::vector<uint8_t> res{};

core/primitives/cid/cid.cpp

@@ -6,7 +6,7 @@
 #include "primitives/cid/cid.hpp"
 
 #include <libp2p/multi/content_identifier_codec.hpp>
-#include <libp2p/multi/uvarint.hpp>
+
 #include "crypto/blake2/blake2b160.hpp"
 
 namespace fc {
@@ -62,6 +62,11 @@ namespace fc {
     OUTCOME_TRY(cid, libp2p::multi::ContentIdentifierCodec::fromString(str));
     return CID{std::move(cid)};
   }
+
+  outcome::result<CID> CID::fromBytes(gsl::span<const uint8_t> input) {
+    OUTCOME_TRY(cid, libp2p::multi::ContentIdentifierCodec::decode(input));
+    return CID{std::move(cid)};
+  }
 }  // namespace fc
 
 namespace fc::common {

core/primitives/cid/cid.hpp

@@ -58,6 +58,8 @@ namespace fc {
     outcome::result<std::vector<uint8_t>> toBytes() const;
 
     static outcome::result<CID> fromString(const std::string &str);
+
+    static outcome::result<CID> fromBytes(gsl::span<const uint8_t> input);
   };
 }  // namespace fc
 

core/primitives/cid/comm_cid.cpp

@@ -4,7 +4,6 @@
  */
 
 #include "primitives/cid/comm_cid.hpp"
-#include <libp2p/multi/uvarint.hpp>
 #include "primitives/cid/comm_cid_errors.hpp"
 
 namespace fc::common {
@@ -44,11 +43,10 @@ namespace fc::common {
       return CommCidError::INVALID_HASH;
     }
 
-    using Version = libp2p::multi::ContentIdentifier::Version;
-
     OUTCOME_TRY(mh, Multihash::create(static_cast<HashType>(code), commitment));
 
-    return CID(Version::V1, kFilecoinCodecType, mh);
+    return CID(
+        libp2p::multi::ContentIdentifier::Version::V1, kFilecoinCodecType, mh);
   }
 
   outcome::result<Comm> CIDToPieceCommitmentV1(const CID &cid) {

core/primitives/tipset/tipset_key.cpp

@@ -5,9 +5,6 @@
 
 #include "primitives/tipset/tipset_key.hpp"
 
-#include <libp2p/multi/content_identifier_codec.hpp>
-#include "common/outcome.hpp"
-
 namespace fc::primitives::tipset {
   namespace {
     using ByteArray = std::vector<uint8_t>;

core/storage/CMakeLists.txt

@@ -4,6 +4,7 @@
 #
 
 add_subdirectory(amt)
+add_subdirectory(car)
 add_subdirectory(chain)
 add_subdirectory(config)
 add_subdirectory(filestore)

core/storage/car/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(car
+    car.cpp
+    )
+target_link_libraries(car
+    cbor
+    p2p::p2p_uvarint
+    )