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

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +3 -3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e5869b2800 - Show all commits

6
src/rpc/websocket_api.cpp
View file

@ -144,7 +144,7 @@ response websocket_api_connection::on_message( const std::string& message )
return response( variant(), { -32600, "Invalid id" }, "2.0" ); return response( variant(), { -32600, "Invalid id" }, "2.0" );
if( var_obj.contains( "method" ) && ( !var_obj["method"].is_string() || var_obj["method"].get_string() == "" ) ) if( var_obj.contains( "method" ) && ( !var_obj["method"].is_string() || var_obj["method"].get_string() == "" ) )
return response( variant(), { -32602, "Missing or invalid method" }, "2.0" ); return response( variant(), { -32600, "Missing or invalid method" }, "2.0" );
if( var_obj.contains( "jsonrpc" ) && ( !var_obj["jsonrpc"].is_string() || var_obj["jsonrpc"] != "2.0" ) ) if( var_obj.contains( "jsonrpc" ) && ( !var_obj["jsonrpc"].is_string() || var_obj["jsonrpc"] != "2.0" ) )
return response( variant(), { -32600, "Unsupported JSON-RPC version" }, "2.0" ); return response( variant(), { -32600, "Unsupported JSON-RPC version" }, "2.0" );
@ -152,7 +152,7 @@ response websocket_api_connection::on_message( const std::string& message )
if( var_obj.contains( "method" ) ) if( var_obj.contains( "method" ) )
{ {
if( var_obj.contains( "params" ) && var_obj["params"].is_object() ) if( var_obj.contains( "params" ) && var_obj["params"].is_object() )
return response( variant(), { -32600, "Named parameters not supported" }, "2.0" ); return response( variant(), { -32602, "Named parameters not supported" }, "2.0" );
if( var_obj.contains( "params" ) && !var_obj["params"].is_array() ) if( var_obj.contains( "params" ) && !var_obj["params"].is_array() )
return response( variant(), { -32600, "Invalid parameters" }, "2.0" ); return response( variant(), { -32600, "Invalid parameters" }, "2.0" );
@ -170,7 +170,7 @@ response websocket_api_connection::on_message( const std::string& message )
return response(); return response();
} }
return response( variant(), { -32602, "Missing method or result or error" }, "2.0" ); return response( variant(), { -32600, "Missing method or result or error" }, "2.0" );
} }
void websocket_api_connection::on_response( const variant& var ) void websocket_api_connection::on_response( const variant& var )