Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Refactored Hive connection check

Browse source
This commit is contained in:
serkixenos 2021-11-02 19:15:53 +01:00
parent aeaab06231
commit 88682e9cc1
1 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp
View file

@ -174,35 +174,13 @@ sidechain_net_handler_hive::sidechain_net_handler_hive(peerplays_sidechain_plugi
} }
} }
std::string schema; node_rpc_client = new hive_node_rpc_client(node_ip, node_rpc_port, node_rpc_user, node_rpc_password, debug_rpc_calls);
auto host = strip_proto_name(node_ip, &schema);
try { std::string chain_id_str = node_rpc_client->get_chain_id();
fc::ip::address ip_addr; if (chain_id_str.empty()) {
try {
// IP address assumed
ip_addr = fc::ip::address(host);
} catch (...) {
try {
// host name assumed
host = resolve_host_addr(host);
ip_addr = fc::ip::address(host);
} catch (...) {
elog("Failed to resolve Hive node address ${ip}", ("ip", node_ip));
FC_ASSERT(false);
}
}
// try to connect to TCP endpoint
fc::http::connection conn;
conn.connect_to(fc::ip::endpoint(ip_addr, node_rpc_port));
} catch (fc::exception &e) {
elog("No Hive node running at ${ip} or wrong rpc port: ${port}", ("ip", node_ip)("port", node_rpc_port)); elog("No Hive node running at ${ip} or wrong rpc port: ${port}", ("ip", node_ip)("port", node_rpc_port));
FC_ASSERT(false); FC_ASSERT(false);
} }
node_rpc_client = new hive_node_rpc_client(schema + host, node_rpc_port, node_rpc_user, node_rpc_password, debug_rpc_calls);
std::string chain_id_str = node_rpc_client->get_chain_id();
chain_id = chain_id_type(chain_id_str); chain_id = chain_id_type(chain_id_str);
std::string is_test_net = node_rpc_client->get_is_test_net(); std::string is_test_net = node_rpc_client->get_is_test_net();