Merge pull request #6781 from EOSIO/reflect-init

reflector_init fix
EOSIO · Feb 19, 2019 · 6ed86a1 · 6ed86a1
2 parents 0ae565a + 063b19c
commit 6ed86a1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/libraries/chain/include/eosio/chain/abi_serializer.hpp b/libraries/chain/include/eosio/chain/abi_serializer.hpp
@@ -633,7 +633,7 @@ namespace impl {
     * @tparam Reslover - callable with the signature (const name& code_account) -> optional<abi_def>
     */
    template<typename T, typename Resolver>
-   class abi_from_variant_visitor : reflector_init_visitor<T>
+   class abi_from_variant_visitor : public reflector_init_visitor<T>
    {
       public:
          abi_from_variant_visitor( const variant_object& _vo, T& v, Resolver _resolver, abi_traverse_context& _ctx )

diff --git a/libraries/chain/transaction.cpp b/libraries/chain/transaction.cpp
@@ -327,7 +327,6 @@ packed_transaction::packed_transaction( transaction&& t, vector<signature_type>&
 void packed_transaction::reflector_init()
 {
    // called after construction, but always on the same thread and before packed_transaction passed to any other threads
-   static_assert(&fc::reflector_init_visitor<packed_transaction>::reflector_init, "FC with reflector_init required");
    static_assert(fc::raw::has_feature_reflector_init_on_unpacked_reflected_types,
                  "FC unpack needs to call reflector_init otherwise unpacked_trx will not be initialized");
    EOS_ASSERT( unpacked_trx.expiration == time_point_sec(), tx_decompression_error, "packed_transaction already unpacked" );

diff --git a/libraries/fc b/libraries/fc
diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
@@ -645,6 +645,10 @@ BOOST_AUTO_TEST_CASE(transaction_test) { try {
    ds2.seekp(0);
    packed_transaction pkt4;
    fc::raw::unpack(ds2, pkt4);
+   // to/from variant
+   fc::variant pkt_v( pkt3 );
+   packed_transaction pkt5;
+   fc::from_variant(pkt_v, pkt5);
 
    bytes raw3 = pkt3.get_raw_transaction();
    bytes raw4 = pkt4.get_raw_transaction();
@@ -654,6 +658,7 @@ BOOST_AUTO_TEST_CASE(transaction_test) { try {
    BOOST_CHECK_EQUAL(true, std::equal(raw.begin(), raw.end(), raw4.begin()));
    BOOST_CHECK_EQUAL(pkt.get_signed_transaction().id(), pkt3.get_signed_transaction().id());
    BOOST_CHECK_EQUAL(pkt.get_signed_transaction().id(), pkt4.get_signed_transaction().id());
+   BOOST_CHECK_EQUAL(pkt.get_signed_transaction().id(), pkt5.get_signed_transaction().id()); // failure indicates reflector_init not working
    BOOST_CHECK_EQUAL(pkt.id(), pkt4.get_signed_transaction().id());
    BOOST_CHECK_EQUAL(true, trx.expiration == pkt4.expiration());
    BOOST_CHECK_EQUAL(true, trx.expiration == pkt4.get_signed_transaction().expiration);
+1 −4		include/fc/io/raw.hpp
+12 −9		include/fc/reflect/reflect.hpp
+1 −1		include/fc/reflect/variant.hpp
+9 −3		src/compress/miniz.c
+2 −2		src/crypto/aes.cpp
+4 −4		src/crypto/elliptic_common.cpp
+1 −1		src/crypto/elliptic_r1.cpp
+3 −0		src/log/log_message.cpp