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

FC Updates from BitShares and myself #21

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

3
src/rpc/websocket_api.cpp
View file

@ -221,7 +221,8 @@ response websocket_api_connection::on_request( const variant& var )
catch ( const fc::exception& e ) catch ( const fc::exception& e )
{ {
if( has_id ) if( has_id )
return response( call.id, error_object{ e.code(), "Execution error", variant( e, _max_conversion_depth ) }, return response( call.id, error_object{ e.code(), "Execution error: " + e.to_string(),
variant( e, _max_conversion_depth ) },
call.jsonrpc ); call.jsonrpc );
} }
catch ( const std::exception& e ) catch ( const std::exception& e )