Unverified Commit a130084d authored by kladko's avatar kladko

bug/SKALE-3662 Adding libzmq

parent 0e0282d7
...@@ -40,32 +40,26 @@ shared_ptr <ZMQMessage> ZMQClient::doRequestReply(Json::Value &_req) { ...@@ -40,32 +40,26 @@ shared_ptr <ZMQMessage> ZMQClient::doRequestReply(Json::Value &_req) {
CHECK_STATE(reqStr.at(reqStr.size() - 1) == '}'); CHECK_STATE(reqStr.at(reqStr.size() - 1) == '}');
auto resultStr = doZmqRequestReply(reqStr); auto resultStr = doZmqRequestReply(reqStr);
try {
CHECK_STATE(resultStr.size() > 5) CHECK_STATE(resultStr.size() > 5)
CHECK_STATE(resultStr.front() == '{') CHECK_STATE(resultStr.front() == '{')
CHECK_STATE(resultStr.back() == '}') CHECK_STATE(resultStr.back() == '}')
cerr << resultStr;
try {
return ZMQMessage::parse(resultStr.c_str(), resultStr.size(), false); return ZMQMessage::parse(resultStr.c_str(), resultStr.size(), false);
} catch (std::exception & e) { } catch (std::exception & e) {
cerr << "Error:" << e.what() << endl; cerr << "Error:" << e.what() << endl;
sleep(10); sleep(10);
throw; throw;
} catch (...) { } catch (...) {
cerr << "Error!" << endl; cerr << "Error!" << endl;
sleep(10); sleep(10);
throw;
} }
} }
...@@ -78,7 +72,7 @@ string ZMQClient::doZmqRequestReply(string &_req) { ...@@ -78,7 +72,7 @@ string ZMQClient::doZmqRequestReply(string &_req) {
reconnect(); reconnect();
CHECK_STATE(clientSocket); CHECK_STATE(clientSocket);
cerr << "ZMQ client sending:" << _req; spdlog::info("ZMQ client sending: \n {}" , _req);
s_send(*clientSocket, _req); s_send(*clientSocket, _req);
...@@ -90,7 +84,13 @@ string ZMQClient::doZmqRequestReply(string &_req) { ...@@ -90,7 +84,13 @@ string ZMQClient::doZmqRequestReply(string &_req) {
// If we got a reply, process it // If we got a reply, process it
if (items[0].revents & ZMQ_POLLIN) { if (items[0].revents & ZMQ_POLLIN) {
string reply = s_recv(*clientSocket); string reply = s_recv(*clientSocket);
cerr << "ZMQ client received received reply:" << reply << endl;
CHECK_STATE(reply.size() > 5);
reply = reply.substr(0, reply.size() - 1);
spdlog::info("ZMQ client received reply:{}", reply);
CHECK_STATE(reply.front() == '{');
CHECK_STATE(reply.back() == '}');
return reply; return reply;
} else { } else {
spdlog::error("W: no response from server, retrying..."); spdlog::error("W: no response from server, retrying...");
......
...@@ -58,8 +58,6 @@ shared_ptr <ZMQMessage> ZMQMessage::parse(const char* _msg, ...@@ -58,8 +58,6 @@ shared_ptr <ZMQMessage> ZMQMessage::parse(const char* _msg,
CHECK_STATE(_msg[_size - 1] == '}'); CHECK_STATE(_msg[_size - 1] == '}');
CHECK_STATE(_msg[0] == '{'); CHECK_STATE(_msg[0] == '{');
cerr << _msg << endl;
auto d = make_shared<rapidjson::Document>(); auto d = make_shared<rapidjson::Document>();
d->Parse(_msg); d->Parse(_msg);
...@@ -98,7 +96,7 @@ shared_ptr <ZMQMessage> ZMQMessage::buildResponse(string& _type, shared_ptr<rapi ...@@ -98,7 +96,7 @@ shared_ptr <ZMQMessage> ZMQMessage::buildResponse(string& _type, shared_ptr<rapi
if (_type == ZMQMessage::BLS_SIGN_RSP) { if (_type == ZMQMessage::BLS_SIGN_RSP) {
return return
make_shared<BLSSignRspMessage>(_d); make_shared<BLSSignRspMessage>(_d);
} else if (_type == ZMQMessage::ECDSA_SIGN_REQ) { } else if (_type == ZMQMessage::ECDSA_SIGN_RSP) {
return return
make_shared<ECDSASignRspMessage>(_d); make_shared<ECDSASignRspMessage>(_d);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment