SKALE-3951 cleanup

parent 1d331742
...@@ -150,7 +150,6 @@ Json::Value getCertificateImpl(const string &hash) { ...@@ -150,7 +150,6 @@ Json::Value getCertificateImpl(const string &hash) {
RETURN_SUCCESS(result) RETURN_SUCCESS(result)
} }
Json::Value SGXRegistrationServer::SignCertificate(const string &csr) { Json::Value SGXRegistrationServer::SignCertificate(const string &csr) {
spdlog::info(__FUNCTION__); spdlog::info(__FUNCTION__);
return signCertificateImpl(csr, autoSign); return signCertificateImpl(csr, autoSign);
...@@ -161,7 +160,6 @@ Json::Value SGXRegistrationServer::GetCertificate(const string &hash) { ...@@ -161,7 +160,6 @@ Json::Value SGXRegistrationServer::GetCertificate(const string &hash) {
return getCertificateImpl(hash); return getCertificateImpl(hash);
} }
void SGXRegistrationServer::initRegistrationServer(bool _autoSign) { void SGXRegistrationServer::initRegistrationServer(bool _autoSign) {
httpServer = make_shared<HttpServer>(BASE_PORT + 1); httpServer = make_shared<HttpServer>(BASE_PORT + 1);
server = make_shared<SGXRegistrationServer>(*httpServer, server = make_shared<SGXRegistrationServer>(*httpServer,
...@@ -190,7 +188,6 @@ int SGXRegistrationServer::exitServer() { ...@@ -190,7 +188,6 @@ int SGXRegistrationServer::exitServer() {
return 0; return 0;
} }
shared_ptr<SGXRegistrationServer> SGXRegistrationServer::getServer() { shared_ptr<SGXRegistrationServer> SGXRegistrationServer::getServer() {
CHECK_STATE(server); CHECK_STATE(server);
return server; return server;
......
...@@ -42,20 +42,16 @@ class SGXRegistrationServer : public AbstractRegServer { ...@@ -42,20 +42,16 @@ class SGXRegistrationServer : public AbstractRegServer {
recursive_mutex m; recursive_mutex m;
bool autoSign; bool autoSign;
static shared_ptr <HttpServer> httpServer; static shared_ptr <HttpServer> httpServer;
static shared_ptr <SGXRegistrationServer> server; static shared_ptr <SGXRegistrationServer> server;
public: public:
static shared_ptr <SGXRegistrationServer> getServer(); static shared_ptr <SGXRegistrationServer> getServer();
SGXRegistrationServer(AbstractServerConnector &connector, serverVersion_t type, bool _autoSign = false); SGXRegistrationServer(AbstractServerConnector &connector, serverVersion_t type, bool _autoSign = false);
virtual Json::Value SignCertificate(const string &csr); virtual Json::Value SignCertificate(const string &csr);
virtual Json::Value GetCertificate(const string &hash); virtual Json::Value GetCertificate(const string &hash);
......
...@@ -162,7 +162,6 @@ uint64_t initEnclave() { ...@@ -162,7 +162,6 @@ uint64_t initEnclave() {
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) {
static atomic<bool> sgxServerInited(false); static atomic<bool> sgxServerInited(false);
static mutex initMutex; static mutex initMutex;
enclaveLogLevel = _logLevel; enclaveLogLevel = _logLevel;
......
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