SKALE-3951 format code

parent 0ac631cc
...@@ -103,10 +103,8 @@ void initUserSpace() { ...@@ -103,10 +103,8 @@ void initUserSpace() {
} }
uint64_t initEnclave() { uint64_t initEnclave() {
#ifndef SGX_HW_SIM #ifndef SGX_HW_SIM
unsigned long support; unsigned long support;
support = get_sgx_support(); support = get_sgx_support();
...@@ -161,7 +159,6 @@ uint64_t initEnclave() { ...@@ -161,7 +159,6 @@ uint64_t initEnclave() {
return SGX_SUCCESS; return SGX_SUCCESS;
} }
void initAll(uint32_t _logLevel, bool _checkCert, void initAll(uint32_t _logLevel, bool _checkCert,
bool _checkZMQSig, bool _autoSign, bool _generateTestKeys) { bool _checkZMQSig, bool _autoSign, bool _generateTestKeys) {
...@@ -237,5 +234,4 @@ void exitAll() { ...@@ -237,5 +234,4 @@ void exitAll() {
CSRManagerServer::exitServer(); CSRManagerServer::exitServer();
SGXInfoServer::exitServer(); SGXInfoServer::exitServer();
ZMQServer::exitZMQServer(); ZMQServer::exitZMQServer();
} }
...@@ -53,8 +53,6 @@ ServerWorker::ServerWorker(zmq::context_t &_ctx, int sock_type, bool _checkSigna ...@@ -53,8 +53,6 @@ ServerWorker::ServerWorker(zmq::context_t &_ctx, int sock_type, bool _checkSigna
zmq_setsockopt(*worker, ZMQ_LINGER, &linger, sizeof(linger)); zmq_setsockopt(*worker, ZMQ_LINGER, &linger, sizeof(linger));
}; };
void ServerWorker::doOneServerLoop() noexcept { void ServerWorker::doOneServerLoop() noexcept {
string replyStr; string replyStr;
...@@ -68,7 +66,6 @@ void ServerWorker::doOneServerLoop() noexcept { ...@@ -68,7 +66,6 @@ void ServerWorker::doOneServerLoop() noexcept {
try { try {
zmq_pollitem_t items[1]; zmq_pollitem_t items[1];
items[0].socket = *worker; items[0].socket = *worker;
items[0].events = ZMQ_POLLIN; items[0].events = ZMQ_POLLIN;
...@@ -154,9 +151,7 @@ void ServerWorker::work() { ...@@ -154,9 +151,7 @@ void ServerWorker::work() {
spdlog::info("Exited worker thread {}", index); spdlog::info("Exited worker thread {}", index);
} }
void ServerWorker::requestExit() { void ServerWorker::requestExit() {
isExitRequested.exchange(true); isExitRequested.exchange(true);
spdlog::info("Closed worker socket {}", index); spdlog::info("Closed worker socket {}", index);
} }
...@@ -121,7 +121,6 @@ string ZMQClient::doZmqRequestReply(string &_req) { ...@@ -121,7 +121,6 @@ string ZMQClient::doZmqRequestReply(string &_req) {
} }
} }
string ZMQClient::readFileIntoString(const string &_fileName) { string ZMQClient::readFileIntoString(const string &_fileName) {
ifstream t(_fileName); ifstream t(_fileName);
string str((istreambuf_iterator<char>(t)), istreambuf_iterator<char>()); string str((istreambuf_iterator<char>(t)), istreambuf_iterator<char>());
......
...@@ -21,9 +21,6 @@ ...@@ -21,9 +21,6 @@
@date 2021 @date 2021
*/ */
#ifndef SGXWALLET_ZMQCLIENT_H #ifndef SGXWALLET_ZMQCLIENT_H
#define SGXWALLET_ZMQCLIENT_H #define SGXWALLET_ZMQCLIENT_H
...@@ -40,28 +37,21 @@ ...@@ -40,28 +37,21 @@
#include <jsonrpccpp/client.h> #include <jsonrpccpp/client.h>
#include "ZMQMessage.h" #include "ZMQMessage.h"
#define REQUEST_TIMEOUT 10000 // msecs, (> 1000!) #define REQUEST_TIMEOUT 10000 // msecs, (> 1000!)
class ZMQClient { class ZMQClient {
private: private:
EVP_PKEY* pkey = 0; EVP_PKEY* pkey = 0;
EVP_PKEY* pubkey = 0; EVP_PKEY* pubkey = 0;
X509* x509Cert = 0; X509* x509Cert = 0;
bool sign = true; bool sign = true;
string certFileName = ""; string certFileName = "";
string certKeyName = ""; string certKeyName = "";
string certificate = ""; string certificate = "";
string key = ""; string key = "";
recursive_mutex mutex; recursive_mutex mutex;
zmq::context_t ctx; zmq::context_t ctx;
...@@ -82,7 +72,6 @@ private: ...@@ -82,7 +72,6 @@ private:
public: public:
ZMQClient(const string &ip, uint16_t port, bool _sign, const string& _certPathName, ZMQClient(const string &ip, uint16_t port, bool _sign, const string& _certPathName,
const string& _certKeyName); const string& _certKeyName);
......
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