Merge pull request #2474 from bitshares/refactor-reflection

Move samet_fund_object reflection into cpp file

Author: abitmore

libraries/chain/include/graphene/chain/asset_object.hpp

@@ -416,6 +416,7 @@ MAP_OBJECT_ID_TO_TYPE(graphene::chain::asset_bitasset_data_object)
 FC_REFLECT_DERIVED( graphene::chain::price_feed_with_icr, (graphene::protocol::price_feed),
                     (initial_collateral_ratio) )
 
+// Note: this is left here but not moved to a cpp file due to the extended_asset_object struct in API.
 FC_REFLECT_DERIVED( graphene::chain::asset_object, (graphene::db::object),
                     (symbol)
                     (precision)

libraries/chain/include/graphene/chain/liquidity_pool_object.hpp

@@ -107,6 +107,7 @@ typedef generic_index<liquidity_pool_object, liquidity_pool_multi_index_type> li
 
 MAP_OBJECT_ID_TO_TYPE( graphene::chain::liquidity_pool_object )
 
+// Note: this is left here but not moved to a cpp file due to the extended_liquidity_pool_object struct in API.
 FC_REFLECT_DERIVED( graphene::chain::liquidity_pool_object, (graphene::db::object),
                     (asset_a)
                     (asset_b)

libraries/chain/include/graphene/chain/samet_fund_object.hpp

@@ -91,12 +91,6 @@ using samet_fund_index = generic_index<samet_fund_object, samet_fund_multi_index
 
 MAP_OBJECT_ID_TO_TYPE( graphene::chain::samet_fund_object )
 
-FC_REFLECT_DERIVED( graphene::chain::samet_fund_object, (graphene::db::object),
-                    (owner_account)
-                    (asset_type)
-                    (balance)
-                    (fee_rate)
-                    (unpaid_amount)
-                  )
+FC_REFLECT_TYPENAME( graphene::chain::samet_fund_object )
 
 GRAPHENE_DECLARE_EXTERNAL_SERIALIZATION( graphene::chain::samet_fund_object )

libraries/chain/small_objects.cpp

@@ -201,6 +201,13 @@ FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::custom_authority_object, (graph
                                (account)(enabled)(valid_from)(valid_to)(operation_type)
                                (auth)(restrictions)(restriction_counter) )
 
+FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::samet_fund_object, (graphene::db::object),
+                    (owner_account)
+                    (asset_type)
+                    (balance)
+                    (fee_rate)
+                    (unpaid_amount)
+                  )
 
 GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::balance_object )
 GRAPHENE_IMPLEMENT_EXTERNAL_SERIALIZATION( graphene::chain::block_summary_object )