Changed build

BLSCrypto.cpp

@@ -160,9 +160,3 @@ bool sign(const char* _encryptedKeyHex, const char* _hashHex, size_t _t, size_t
 
 }
 
-
-void init_all() {
-    init_server();
-    init_enclave();
-    init_daemon();
-}
\ No newline at end of file

Makefile.am

@@ -65,7 +65,7 @@ bin_PROGRAMS =  sgxwallet testw
 COMMON_SRC = sgx_stub.c sgx_detect_linux.c create_enclave.c oc_alloc.c
 COMMON_ENCLAVE_SRC = secure_enclave_u.c secure_enclave_u.h
 
-sgxwallet_SOURCES = sgxwallet.c SGXWalletServer.cpp BLSCrypto.cpp BLSPrivateKeyShareSGX.cpp LevelDB.cpp $(COMMON_SRC)
+sgxwallet_SOURCES = sgxwallet.c SGXWalletServer.cpp BLSCrypto.cpp ServerInit.cpp BLSPrivateKeyShareSGX.cpp LevelDB.cpp $(COMMON_SRC)
 
 nodist_sgxwallet_SOURCES = $(COMMON_ENCLAVE_SRC)
 EXTRA_sgxwallet_DEPENDENCIES = secure_enclave.signed.so
@@ -90,7 +90,7 @@ secure_enclave.signed.so: secure_enclave/secure_enclave.signed.so
 
 sgxwallet_LDADD=-l$(SGX_URTS_LIB) -Lleveldb/build -LlibBLS/build  -LlibBLS/build/libff/libff -l:libbls.a -l:libleveldb.a -l:libff.a -lgmp -ldl -l:libsgx_capable.a -l:libsgx_tprotected_fs.a   -ljsonrpccpp-stub -lpthread -ljsonrpccpp-common -ljsonrpccpp-server -ljsoncpp -lprocps
 
-testw_SOURCES=testw.cpp SGXWalletServer.cpp  BLSCrypto.cpp BLSPrivateKeyShareSGX.cpp $(COMMON_SRC)
+testw_SOURCES=testw.cpp SGXWalletServer.cpp  BLSCrypto.cpp ServerInit.cpp BLSPrivateKeyShareSGX.cpp $(COMMON_SRC)
 nodist_testw_SOURCES=${nodist_sgxwallet_SOURCES}
 EXTRA_testw_DEPENDENCIES=${EXTRA_sgxwallet_DEPENDENCIES}
 testw_LDADD= ${sgxwallet_LDADD}
\ No newline at end of file

ServerInit.cpp

+//
+// Created by kladko on 9/2/19.
+//
+#include <memory>
+
+
+#include "libff/algebra/curves/alt_bn128/alt_bn128_init.hpp"
+
+#include "bls.h"
+
+
+#include "leveldb/db.h"
+#include <jsonrpccpp/server/connectors/httpserver.h>
+#include "BLSPrivateKeyShareSGX.h"
+
+
+#include "sgxwallet_common.h"
+#include "create_enclave.h"
+#include "secure_enclave_u.h"
+#include "sgx_detect.h"
+#include <gmp.h>
+#include <sgx_urts.h>
+
+#include "sgxwallet.h"
+
+#include "SGXWalletServer.h"
+
+#include "BLSCrypto.h"
+#include "ServerInit.h"
+
+
+void init_all() {
+    init_server();
+    init_enclave();
+    init_daemon();
+}
\ No newline at end of file