Correctly return legacy_signed_block in condenser_api steemit#2116

hiroki-mizukami · Feb 13, 2018 · f0d3171 · f0d3171
1 parent 4607ea6
commit f0d3171
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/libraries/plugins/apis/condenser_api/condenser_api.cpp b/libraries/plugins/apis/condenser_api/condenser_api.cpp
@@ -710,7 +710,13 @@ namespace detail
    {
       CHECK_ARG_SIZE( 1 )
       FC_ASSERT( _block_api, "block_api_plugin not enabled." );
-      return _block_api->get_block( { args[0].as< uint32_t >() } ).block;
+      get_block_return result;
+      auto b = _block_api->get_block( { args[0].as< uint32_t >() } ).block;
+
+      if( b )
+         result = legacy_signed_block( *b );
+
+      return result;
    }
 
    DEFINE_API_IMPL( condenser_api_impl, get_ops_in_block )

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
@@ -851,7 +851,7 @@ DEFINE_API_ARGS( get_trending_tags,                      vector< variant >,   ve
 DEFINE_API_ARGS( get_state,                              vector< variant >,   state )
 DEFINE_API_ARGS( get_active_witnesses,                   vector< variant >,   vector< account_name_type > )
 DEFINE_API_ARGS( get_block_header,                       vector< variant >,   optional< block_header > )
-DEFINE_API_ARGS( get_block,                              vector< variant >,   optional< block_api::api_signed_block_object > )
+DEFINE_API_ARGS( get_block,                              vector< variant >,   optional< legacy_signed_block > )
 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 )