Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor code refactory

Browse source
This commit is contained in:
abitmore 2019-04-03 12:05:40 -04:00
parent 03cc93d0e4
commit 3655fe148b
1 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/rpc/websocket_api.cpp
View file

@ -11,7 +11,7 @@ websocket_api_connection::websocket_api_connection( const std::shared_ptr<fc::ht
uint32_t max_depth )
: api_connection(max_depth),_connection(c)
{
FC_ASSERT( c );
FC_ASSERT( _connection, "A valid websocket connection is required" );
_rpc_state.add_method( "call", [this]( const variants& args ) -> variant
{
FC_ASSERT( args.size() == 3 && args[2].is_array() );
@ -59,43 +59,41 @@ variant websocket_api_connection::send_call(
string method_name,
variants args /* = variants() */ )
{
if( _connection )
{
auto request = _rpc_state.start_remote_call( "call", { api_id, std::move(method_name), std::move(args) } );
_connection->send_message( fc::json::to_string( fc::variant( request, _max_conversion_depth ),
fc::json::stringify_large_ints_and_doubles,
_max_conversion_depth ) );
return _rpc_state.wait_for_response( *request.id );
}
return variant(); // TODO return an error
if( !_connection ) // defensive check
return variant(); // TODO return an error?
auto request = _rpc_state.start_remote_call( "call", { api_id, std::move(method_name), std::move(args) } );
_connection->send_message( fc::json::to_string( fc::variant( request, _max_conversion_depth ),
fc::json::stringify_large_ints_and_doubles,
_max_conversion_depth ) );
return _rpc_state.wait_for_response( *request.id );
}
variant websocket_api_connection::send_callback(
uint64_t callback_id,
variants args /* = variants() */ )
{
if( _connection )
{
auto request = _rpc_state.start_remote_call( "callback", { callback_id, std::move(args) } );
_connection->send_message( fc::json::to_string( fc::variant( request, _max_conversion_depth ),
fc::json::stringify_large_ints_and_doubles,
_max_conversion_depth ) );
return _rpc_state.wait_for_response( *request.id );
}
return variant(); // TODO return an error
if( !_connection ) // defensive check
return variant(); // TODO return an error?
auto request = _rpc_state.start_remote_call( "callback", { callback_id, std::move(args) } );
_connection->send_message( fc::json::to_string( fc::variant( request, _max_conversion_depth ),
fc::json::stringify_large_ints_and_doubles,
_max_conversion_depth ) );
return _rpc_state.wait_for_response( *request.id );
}
void websocket_api_connection::send_notice(
uint64_t callback_id,
variants args /* = variants() */ )
{
if( _connection )
{
fc::rpc::request req{ optional<uint64_t>(), "notice", { callback_id, std::move(args) } };
_connection->send_message( fc::json::to_string( fc::variant( req, _max_conversion_depth ),
fc::json::stringify_large_ints_and_doubles,
_max_conversion_depth ) );
}
if( !_connection ) // defensive check
return;
fc::rpc::request req{ optional<uint64_t>(), "notice", { callback_id, std::move(args) } };
_connection->send_message( fc::json::to_string( fc::variant( req, _max_conversion_depth ),
fc::json::stringify_large_ints_and_doubles,
_max_conversion_depth ) );
}
std::string websocket_api_connection::on_message(