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 +2 -11
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0a50ac23e0 - Show all commits

1
include/fc/network/http/websocket.hpp
View file

@ -55,7 +55,6 @@ namespace fc { namespace http {
void stop_listening(); void stop_listening();
void close(); void close();
void synchronous_close();
private: private:
friend class detail::websocket_server_impl; friend class detail::websocket_server_impl;

8
src/network/http/websocket.cpp
View file

@ -649,14 +649,6 @@ namespace fc { namespace http {
my->_server.close(connection.first, websocketpp::close::status::normal, "Goodbye"); my->_server.close(connection.first, websocketpp::close::status::normal, "Goodbye");
} }
void websocket_server::synchronous_close()
{
close();
if (my->_closed)
my->_closed->wait();
}
websocket_tls_server::websocket_tls_server( const string& server_pem, const string& ssl_password ):my( new detail::websocket_tls_server_impl(server_pem, ssl_password) ) {} websocket_tls_server::websocket_tls_server( const string& server_pem, const string& ssl_password ):my( new detail::websocket_tls_server_impl(server_pem, ssl_password) ) {}

4
tests/api_tests.cpp
View file

@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(login_test) {
BOOST_CHECK(remote_triggered); BOOST_CHECK(remote_triggered);
client->synchronous_close(); client->synchronous_close();
server->synchronous_close(); server->close();
fc::usleep(fc::milliseconds(50)); fc::usleep(fc::milliseconds(50));
client.reset(); client.reset();
server.reset(); server.reset();
@ -131,7 +131,7 @@ BOOST_AUTO_TEST_CASE(optionals_test) {
BOOST_CHECK_EQUAL(remote_optionals->foo("a", {}, "c"), "[\"a\",null,\"c\"]"); BOOST_CHECK_EQUAL(remote_optionals->foo("a", {}, "c"), "[\"a\",null,\"c\"]");
client->synchronous_close(); client->synchronous_close();
server->synchronous_close(); server->close();
fc::usleep(fc::milliseconds(50)); fc::usleep(fc::milliseconds(50));
client.reset(); client.reset();
server.reset(); server.reset();