SKALE-2341 Added tags for older commits

Log.cpp

@@ -21,8 +21,9 @@
     @date 2018
 */
 
+#include "spdlog/spdlog.h"
+#include "sgxwallet_common.h"
 #include "common.h"
-
 #include "Log.h"
 
 using namespace std;

SGXWalletServer.cpp

@@ -45,6 +45,23 @@
 
 #include "common.h"
 
+void setFullOptions(int _printDebugInfo, int _useHTTPS, int _autoconfirm, int _encryptKeys) {
+    if (_printDebugInfo)
+        spdlog::set_level(spdlog::level::info);
+    else {
+        spdlog::set_level(spdlog::level::debug);
+    }
+    printDebugInfo = _printDebugInfo;
+    useHTTPS = _useHTTPS;
+    autoconfirm = _autoconfirm;
+    encryptKeys = _encryptKeys;
+}
+
+
+void setOptions(int _printDebugInfo, int _useHTTPS, int _autoconfirm) {
+    setFullOptions(_printDebugInfo, _useHTTPS, _autoconfirm, false);
+}
+
 
 bool isStringDec(string &_str) {
     auto res = find_if_not(_str.begin(), _str.end(), [](char c) -> bool {

SGXWalletServer.h

@@ -31,6 +31,8 @@
 #endif
 
 
+EXTERNC void setFullOptions(int _printDebugInfo, int _useHTTPS, int _autoconfirm, int _encryptKeys);
+EXTERNC void setOptions(int _printDebugInfo, int _useHTTPS, int _autoconfirm);
 
 
 

sgxwallet_common.h

@@ -35,7 +35,6 @@
 
 
 
-
 extern int printDebugInfo;
 extern int useHTTPS;
 extern int encryptKeys;
@@ -43,17 +42,7 @@ extern int autoconfirm;
 
 
 
-inline void setFullOptions(int _printDebugInfo, int _useHTTPS, int _autoconfirm, int _encryptKeys) {
-    printDebugInfo = _printDebugInfo;
-    useHTTPS = _useHTTPS;
-    autoconfirm = _autoconfirm;
-    encryptKeys = _encryptKeys;
-}
-
 
-inline void setOptions(int _printDebugInfo, int _useHTTPS, int _autoconfirm) {
-    setFullOptions(_printDebugInfo, _useHTTPS, _autoconfirm, false);
-}
 
 
 

testw.cpp

@@ -46,13 +46,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <gmp.h>
 #include <sgx_urts.h>
 #include <stdio.h>
+#include <jsonrpccpp/client/connectors/httpclient.h>
+#include <sgx_tcrypto.h>
+
 #include "BLSCrypto.h"
 #include "ServerInit.h"
 #include "DKGCrypto.h"
 #include "RPCException.h"
 #include "LevelDB.h"
 #include "SGXWalletServer.hpp"
-#include <sgx_tcrypto.h>
+
 
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 
@@ -66,7 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <thread>
 #include "common.h"
 #include "stubclient.h"
-#include <jsonrpccpp/client/connectors/httpclient.h>
+#include "SGXWalletServer.h"
 
 default_random_engine randGen((unsigned int) time(0));