SKALE-3067-cleanup-sgx

CSRManagerServer.cpp

@@ -40,7 +40,6 @@ CSRManagerServer::CSRManagerServer(AbstractServerConnector &connector,
                                    serverVersion_t type) : abstractCSRManagerServer(connector, type) {}
 
 Json::Value getUnsignedCSRsImpl() {
-    spdlog::info(__FUNCTION__);
     INIT_RESULT(result)
 
     try {
@@ -50,12 +49,11 @@ Json::Value getUnsignedCSRsImpl() {
         }
     } HANDLE_SGX_EXCEPTION(result);
 
-    return result;
+    RETURN_SUCCESS(result)
 }
 
 Json::Value signByHashImpl(const string &hash, int status) {
-    Json::Value result;
-    result["errorMessage"] = "";
+    INIT_RESULT(result)
 
     try {
         if (!(status == 0 || status == 2)) {
@@ -89,7 +87,6 @@ Json::Value signByHashImpl(const string &hash, int status) {
                 LevelDB::getCsrStatusDb()->deleteKey(status_db_key);
                 LevelDB::getCsrStatusDb()->writeDataUnique(status_db_key, "-1");
                 throw SGXException(FAIL_TO_CREATE_CERTIFICATE, "CLIENT CERTIFICATE GENERATION FAILED");
-                //exit(-1);
             }
         }
 
@@ -102,7 +99,7 @@ Json::Value signByHashImpl(const string &hash, int status) {
 
     } HANDLE_SGX_EXCEPTION(result)
 
-    return result;
+    RETURN_SUCCESS(result)
 }
 
 Json::Value CSRManagerServer::getUnsignedCSRs() {

Log.h

@@ -74,7 +74,7 @@ public:
 };
 
 #define INIT_RESULT(__RESULT__)     Json::Value __RESULT__; \
-              int errStatus = UNKNOWN_ERROR; string errMsg(BUF_LEN, '\0');__RESULT__["status"] = 0; __RESULT__["errorMessage"] = \
+              int errStatus = UNKNOWN_ERROR; string errMsg(BUF_LEN, '\0');__RESULT__["status"] = UNKNOWN_ERROR; __RESULT__["errorMessage"] = \
 "Server error. Please see server log.";
 
 #define HANDLE_SGX_EXCEPTION(__RESULT__) \

SGXRegistrationServer.cpp

@@ -112,7 +112,7 @@ Json::Value signCertificateImpl(const string &_csr, bool _autoSign = false) {
 
     } HANDLE_SGX_EXCEPTION(result)
 
-    return result;
+    RETURN_SUCCESS(result)
 }
 
 Json::Value getCertificateImpl(const string &hash) {
@@ -147,7 +147,7 @@ Json::Value getCertificateImpl(const string &hash) {
 
     } HANDLE_SGX_EXCEPTION(result)
 
-    return result;
+    RETURN_SUCCESS(result)
 }