Use Message with strong types (#74)

Signed-off-by: Eugene Kovalev <[email protected]>

Author: ekovalev

core/common/buffer.hpp

@@ -224,7 +224,7 @@ namespace fc::common {
    * @return reference to stream
    */
   template <class Stream,
-            typename = std::enable_if_t<Stream::is_encoder_stream>>
+            typename = std::enable_if_t<Stream::is_cbor_encoder_stream>>
   Stream &operator<<(Stream &s, const Buffer &buffer) {
     return s << buffer.toVector();
   }
@@ -237,7 +237,7 @@ namespace fc::common {
    * @return reference to stream
    */
   template <class Stream,
-            typename = std::enable_if_t<Stream::is_decoder_stream>>
+            typename = std::enable_if_t<Stream::is_cbor_decoder_stream>>
   Stream &operator>>(Stream &s, Buffer &buffer) {
     std::vector<uint8_t> data;
     s >> data;

core/vm/actor/actor.hpp

@@ -28,12 +28,37 @@ namespace fc::vm::actor {
    */
   struct MethodNumber {
     uint64_t method_number;
+
+    inline bool operator==(const MethodNumber &other) const {
+      return method_number == other.method_number;
+    }
   };
 
+  template <class Stream,
+            typename = std::enable_if_t<
+                std::remove_reference<Stream>::type::is_cbor_encoder_stream>>
+  Stream &operator<<(Stream &&s, const MethodNumber &method) noexcept {
+    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) noexcept {
+    return s >> method.method_number;
+  }
+
   /**
    * MethodParams is serialized parameters to the method call
    */
-  class MethodParams : public Buffer {};
+  class MethodParams : public Buffer {
+    using Buffer::Buffer;
+
+   public:
+    inline bool operator==(const MethodParams &other) const {
+      return Buffer::operator==(static_cast<const Buffer &>(other));
+    }
+  };
 
   /**
    * CodeID identifies an actor's code (either one of the builtin actors, or, in

core/vm/message/CMakeLists.txt

@@ -12,6 +12,7 @@ add_library(message
 target_link_libraries(message
     Boost::boost
     address
+    buffer
     logger
     keystore
     outcome

core/vm/message/message.hpp

@@ -12,6 +12,7 @@
 #include "crypto/signature/signature.hpp"
 #include "primitives/address/address.hpp"
 #include "primitives/big_int.hpp"
+#include "vm/actor/actor.hpp"
 
 namespace fc::vm::message {
 
@@ -24,6 +25,8 @@ namespace fc::vm::message {
     VERIFICATION_FAILURE
   };
 
+  using actor::MethodNumber;
+  using actor::MethodParams;
   using crypto::signature::Signature;
   using primitives::BigInt;
   using primitives::address::Address;
@@ -42,8 +45,8 @@ namespace fc::vm::message {
     BigInt gasPrice;
     BigInt gasLimit;
 
-    uint64_t method;
-    std::vector<uint8_t> params;
+    MethodNumber method;
+    MethodParams params;
 
     /**
      * @brief Message equality operator

test/core/vm/message/message_test.cpp

@@ -45,6 +45,7 @@ using fc::vm::message::cid;
 using fc::vm::message::MessageError;
 using fc::vm::message::MessageSigner;
 using fc::vm::message::MessageSignerImpl;
+using fc::vm::message::MethodParams;
 using fc::vm::message::SignedMessage;
 using fc::vm::message::UnsignedMessage;
 
@@ -59,14 +60,14 @@ UnsignedMessage makeMessage(Address const &from,
                             Address const &to,
                             uint64_t nonce) {
   return UnsignedMessage{
-      to,         // to Address
-      from,       // from Address
-      nonce,      // nonce
-      BigInt(1),  // transfer value
-      BigInt(0),  // gasPrice
-      BigInt(1),  // gasLimit
-      0,          // method num
-      ""_unhex    // method params
+      to,                     // to Address
+      from,                   // from Address
+      nonce,                  // nonce
+      BigInt(1),              // transfer value
+      BigInt(0),              // gasPrice
+      BigInt(1),              // gasLimit
+      0,                      // method num
+      MethodParams{""_unhex}  // method params
   };
 }