Merge pull request steemit#2184 from steemit/2183-legacy-chain-props

Return old asset serialization in get_chain_properties
rose312 · Mar 1, 2018 · 4e93bf6 · 4e93bf6
2 parents 3defe1e + 173beee
commit 4e93bf6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libraries/plugins/apis/condenser_api/condenser_api.cpp b/libraries/plugins/apis/condenser_api/condenser_api.cpp
@@ -753,7 +753,7 @@ namespace detail
    DEFINE_API_IMPL( condenser_api_impl, get_chain_properties )
    {
       CHECK_ARG_SIZE( 0 )
-      return _database_api->get_witness_schedule( {} ).median_props;
+      return legacy_chain_properties( _database_api->get_witness_schedule( {} ).median_props );
    }
 
    DEFINE_API_IMPL( condenser_api_impl, get_current_median_history_price )

diff --git a/libraries/plugins/apis/condenser_api/include/steem/plugins/condenser_api/condenser_api.hpp b/libraries/plugins/apis/condenser_api/include/steem/plugins/condenser_api/condenser_api.hpp
@@ -869,7 +869,7 @@ DEFINE_API_ARGS( get_block,                              vector< variant >,   op
 DEFINE_API_ARGS( get_ops_in_block,                       vector< variant >,   vector< api_operation_object > )
 DEFINE_API_ARGS( get_config,                             vector< variant >,   fc::variant_object )
 DEFINE_API_ARGS( get_dynamic_global_properties,          vector< variant >,   extended_dynamic_global_properties )
-DEFINE_API_ARGS( get_chain_properties,                   vector< variant >,   chain_properties )
+DEFINE_API_ARGS( get_chain_properties,                   vector< variant >,   legacy_chain_properties )
 DEFINE_API_ARGS( get_current_median_history_price,       vector< variant >,   legacy_price )
 DEFINE_API_ARGS( get_feed_history,                       vector< variant >,   api_feed_history_object )
 DEFINE_API_ARGS( get_witness_schedule,                   vector< variant >,   api_witness_schedule_object )