Compare commits
1 commit
master
...
GRPH134_#1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
56b6168e73 |
4 changed files with 5 additions and 5 deletions
|
|
@ -226,7 +226,7 @@ namespace detail {
|
||||||
|
|
||||||
void new_connection( const fc::http::websocket_connection_ptr& c )
|
void new_connection( const fc::http::websocket_connection_ptr& c )
|
||||||
{
|
{
|
||||||
auto wsc = std::make_shared<fc::rpc::websocket_api_connection>(c, GRAPHENE_MAX_NESTED_OBJECTS);
|
auto wsc = std::make_shared<fc::rpc::websocket_api_connection>(*c, GRAPHENE_MAX_NESTED_OBJECTS);
|
||||||
auto login = std::make_shared<graphene::app::login_api>( std::ref(*_self) );
|
auto login = std::make_shared<graphene::app::login_api>( std::ref(*_self) );
|
||||||
login->enable_api("database_api");
|
login->enable_api("database_api");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ void delayed_node_plugin::plugin_set_program_options(bpo::options_description& c
|
||||||
|
|
||||||
void delayed_node_plugin::connect()
|
void delayed_node_plugin::connect()
|
||||||
{
|
{
|
||||||
my->client_connection = std::make_shared<fc::rpc::websocket_api_connection>(my->client.connect(my->remote_endpoint), GRAPHENE_MAX_NESTED_OBJECTS);
|
my->client_connection = std::make_shared<fc::rpc::websocket_api_connection>(*my->client.connect(my->remote_endpoint), GRAPHENE_MAX_NESTED_OBJECTS);
|
||||||
my->database_api = my->client_connection->get_remote_api<graphene::app::database_api>(0);
|
my->database_api = my->client_connection->get_remote_api<graphene::app::database_api>(0);
|
||||||
my->client_connection_closed = my->client_connection->closed.connect([this] {
|
my->client_connection_closed = my->client_connection->closed.connect([this] {
|
||||||
connection_failed();
|
connection_failed();
|
||||||
|
|
|
||||||
|
|
@ -174,7 +174,7 @@ int main( int argc, char** argv )
|
||||||
fc::http::websocket_client client;
|
fc::http::websocket_client client;
|
||||||
idump((wdata.ws_server));
|
idump((wdata.ws_server));
|
||||||
auto con = client.connect( wdata.ws_server );
|
auto con = client.connect( wdata.ws_server );
|
||||||
auto apic = std::make_shared<fc::rpc::websocket_api_connection>(con, GRAPHENE_MAX_NESTED_OBJECTS);
|
auto apic = std::make_shared<fc::rpc::websocket_api_connection>(*con, GRAPHENE_MAX_NESTED_OBJECTS);
|
||||||
|
|
||||||
auto remote_api = apic->get_remote_api< login_api >(1);
|
auto remote_api = apic->get_remote_api< login_api >(1);
|
||||||
edump((wdata.ws_user)(wdata.ws_password) );
|
edump((wdata.ws_user)(wdata.ws_password) );
|
||||||
|
|
@ -230,7 +230,7 @@ int main( int argc, char** argv )
|
||||||
if( options.count("rpc-tls-endpoint") )
|
if( options.count("rpc-tls-endpoint") )
|
||||||
{
|
{
|
||||||
_websocket_tls_server->on_connection([&]( const fc::http::websocket_connection_ptr& c ){
|
_websocket_tls_server->on_connection([&]( const fc::http::websocket_connection_ptr& c ){
|
||||||
auto wsc = std::make_shared<fc::rpc::websocket_api_connection>(c, GRAPHENE_MAX_NESTED_OBJECTS);
|
auto wsc = std::make_shared<fc::rpc::websocket_api_connection>(*c, GRAPHENE_MAX_NESTED_OBJECTS);
|
||||||
wsc->register_api(wapi);
|
wsc->register_api(wapi);
|
||||||
c->set_session_data( wsc );
|
c->set_session_data( wsc );
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -222,7 +222,7 @@ public:
|
||||||
wallet_data.ws_password = "";
|
wallet_data.ws_password = "";
|
||||||
websocket_connection = websocket_client.connect( wallet_data.ws_server );
|
websocket_connection = websocket_client.connect( wallet_data.ws_server );
|
||||||
|
|
||||||
api_connection = std::make_shared<fc::rpc::websocket_api_connection>(websocket_connection, GRAPHENE_MAX_NESTED_OBJECTS);
|
api_connection = std::make_shared<fc::rpc::websocket_api_connection>(*websocket_connection, GRAPHENE_MAX_NESTED_OBJECTS);
|
||||||
|
|
||||||
remote_login_api = api_connection->get_remote_api< graphene::app::login_api >(1);
|
remote_login_api = api_connection->get_remote_api< graphene::app::login_api >(1);
|
||||||
BOOST_CHECK(remote_login_api->login( wallet_data.ws_user, wallet_data.ws_password ) );
|
BOOST_CHECK(remote_login_api->login( wallet_data.ws_user, wallet_data.ws_password ) );
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue