use CBOR annotations (#103)

Signed-off-by: Alexey-N-Chernyshov <[email protected]>

Author: Alexey-N-Chernyshov

core/primitives/block/block.hpp

@@ -1,5 +1,12 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 #include <boost/optional.hpp>
 
+#include "codec/cbor/streams_annotation.hpp"
+#include "crypto/signature/signature.hpp"
 #include "primitives/address/address.hpp"
 #include "primitives/address/address_codec.hpp"
 #include "primitives/big_int.hpp"
@@ -8,7 +15,6 @@
 #include "primitives/ticket/epost_ticket_codec.hpp"
 #include "primitives/ticket/ticket.hpp"
 #include "primitives/ticket/ticket_codec.hpp"
-#include "crypto/signature/signature.hpp"
 
 namespace fc::primitives::block {
   using primitives::BigInt;
@@ -46,10 +52,7 @@ namespace fc::primitives::block {
            && lhs.fork_signaling == rhs.fork_signaling;
   }
 
-  template <class Stream,
-            typename = std::enable_if_t<
-                std::remove_reference_t<Stream>::is_cbor_encoder_stream>>
-  Stream &operator<<(Stream &&s, const BlockHeader &block) {
+  CBOR_ENCODE(BlockHeader, block) {
     return s << (s.list() << block.miner << block.ticket << block.epost_proof
                           << block.parents << block.parent_weight
                           << block.height << block.parent_state_root
@@ -58,10 +61,7 @@ namespace fc::primitives::block {
                           << block.block_sig << block.fork_signaling);
   }
 
-  template <class Stream,
-            typename = std::enable_if_t<
-                std::remove_reference_t<Stream>::is_cbor_decoder_stream>>
-  Stream &operator>>(Stream &&s, BlockHeader &block) {
+  CBOR_DECODE(BlockHeader, block) {
     s.list() >> block.miner >> block.ticket >> block.epost_proof
         >> block.parents >> block.parent_weight >> block.height
         >> block.parent_state_root >> block.parent_message_receipts

core/vm/actor/actor.hpp

@@ -6,6 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_ACTOR_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_ACTOR_HPP
 
+#include "codec/cbor/streams_annotation.hpp"
 #include "common/buffer.hpp"
 #include "primitives/address/address.hpp"
 #include "primitives/big_int.hpp"
@@ -38,17 +39,11 @@ namespace fc::vm::actor {
     }
   };
 
-  template <class Stream,
-            typename = std::enable_if_t<
-                std::remove_reference<Stream>::type::is_cbor_encoder_stream>>
-  Stream &operator<<(Stream &&s, const MethodNumber &method) {
+  CBOR_ENCODE(MethodNumber, method) {
     return s << method.method_number;
   }
 
-  template <class Stream,
-            typename = std::enable_if_t<
-                std::remove_reference<Stream>::type::is_cbor_decoder_stream>>
-  Stream &operator>>(Stream &&s, MethodNumber &method) {
+  CBOR_DECODE(MethodNumber, method) {
     return s >> method.method_number;
   }
 
@@ -97,18 +92,12 @@ namespace fc::vm::actor {
 
   bool operator==(const Actor &lhs, const Actor &rhs);
 
-  template <class Stream,
-            typename = std::enable_if_t<
-                std::remove_reference_t<Stream>::is_cbor_encoder_stream>>
-  Stream &operator<<(Stream &&s, const Actor &actor) {
+  CBOR_ENCODE(Actor, actor) {
     return s << (s.list() << actor.code << actor.head << actor.nonce
                           << actor.balance);
   }
 
-  template <class Stream,
-            typename = std::enable_if_t<
-                std::remove_reference_t<Stream>::is_cbor_decoder_stream>>
-  Stream &operator>>(Stream &&s, Actor &actor) {
+  CBOR_DECODE(Actor, actor) {
     s.list() >> actor.code >> actor.head >> actor.nonce >> actor.balance;
     return s;
   }

core/vm/actor/builtin/account/account_actor.hpp

@@ -6,6 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_ACCOUNT_ACTOR_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_ACCOUNT_ACTOR_HPP
 
+#include "codec/cbor/streams_annotation.hpp"
 #include "primitives/address/address_codec.hpp"
 #include "vm/state/state_tree.hpp"
 
@@ -19,21 +20,6 @@ namespace fc::vm::actor::builtin::account {
     Address address;
   };
 
-  template <class Stream,
-            typename = std::enable_if_t<
-                std::remove_reference_t<Stream>::is_cbor_encoder_stream>>
-  Stream &operator<<(Stream &&s, const AccountActorState &state) {
-    return s << (s.list() << state.address);
-  }
-
-  template <class Stream,
-            typename = std::enable_if_t<
-                std::remove_reference_t<Stream>::is_cbor_decoder_stream>>
-  Stream &operator>>(Stream &&s, AccountActorState &state) {
-    s.list() >> state.address;
-    return s;
-  }
-
   /// Account actors represent actors without code
   struct AccountActor {
     /// Create account actor from BLS or Secp256k1 address
@@ -48,6 +34,16 @@ namespace fc::vm::actor::builtin::account {
     static outcome::result<Address> resolveToKeyAddress(
         const std::shared_ptr<StateTree> &state_tree, const Address &address);
   };
+
+  CBOR_ENCODE(AccountActorState, state) {
+    return s << (s.list() << state.address);
+  }
+
+  CBOR_DECODE(AccountActorState, state) {
+    s.list() >> state.address;
+    return s;
+  }
+
 }  // namespace fc::vm::actor::builtin::account
 
 #endif  // CPP_FILECOIN_CORE_VM_ACTOR_ACCOUNT_ACTOR_HPP

core/vm/actor/builtin/init/init_actor.hpp

@@ -6,6 +6,7 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_INIT_ACTOR_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_INIT_ACTOR_HPP
 
+#include "codec/cbor/streams_annotation.hpp"
 #include "storage/ipfs/datastore.hpp"
 #include "vm/actor/actor_method.hpp"
 
@@ -23,17 +24,11 @@ namespace fc::vm::actor::builtin::init {
     uint64_t next_id{};
   };
 
-  template <class Stream,
-            typename = std::enable_if_t<
-                std::remove_reference_t<Stream>::is_cbor_encoder_stream>>
-  Stream &operator<<(Stream &&s, const InitActorState &state) {
+  CBOR_ENCODE(InitActorState, state) {
     return s << (s.list() << state.address_map << state.next_id);
   }
 
-  template <class Stream,
-            typename = std::enable_if_t<
-                std::remove_reference_t<Stream>::is_cbor_decoder_stream>>
-  Stream &operator>>(Stream &&s, InitActorState &state) {
+  CBOR_DECODE(InitActorState, state) {
     s.list() >> state.address_map >> state.next_id;
     return s;
   }
@@ -51,17 +46,11 @@ namespace fc::vm::actor::builtin::init {
 
   extern const ActorExports exports;
 
-  template <class Stream,
-            typename = std::enable_if_t<
-                std::remove_reference_t<Stream>::is_cbor_encoder_stream>>
-  Stream &operator<<(Stream &&s, const ExecParams &params) {
+  CBOR_ENCODE(ExecParams, params) {
     return s << (s.list() << params.code << params.params);
   }
 
-  template <class Stream,
-            typename = std::enable_if_t<
-                std::remove_reference_t<Stream>::is_cbor_decoder_stream>>
-  Stream &operator>>(Stream &&s, ExecParams &params) {
+  CBOR_DECODE(ExecParams, params) {
     s.list() >> params.code >> params.params;
     return s;
   }