Cypher_Stack/wownero
2
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2025-01-08 03:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove zeromq completely

Browse Source
This commit is contained in:
fuwa 2019-11-06 14:25:36 +08:00 committed by wowario
parent 8635d5dd3e
commit 903a34edde
5 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -970,6 +970,9 @@ find_library(NORM_LIBRARY norm)
find_library(PROTOLIB_LIBRARY protolib) find_library(PROTOLIB_LIBRARY protolib)
find_library(SODIUM_LIBRARY sodium) find_library(SODIUM_LIBRARY sodium)
set(ZMQ_INCLUDE_PATH zmq_dummy_include_path)
set(ZMQ_LIB zmq_dummy_lib_2)
if(NOT ZMQ_INCLUDE_PATH) if(NOT ZMQ_INCLUDE_PATH)
message(FATAL_ERROR "Could not find required header zmq.h") message(FATAL_ERROR "Could not find required header zmq.h")
endif() endif()

1
src/daemon/CMakeLists.txt
View File

@ -88,7 +88,6 @@ target_link_libraries(daemon
${Boost_REGEX_LIBRARY} ${Boost_REGEX_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${ZMQ_LIB}
${GNU_READLINE_LIBRARY} ${GNU_READLINE_LIBRARY}
${EXTRA_LIBRARIES} ${EXTRA_LIBRARIES}
${Blocks}) ${Blocks})

10
src/daemon/daemon.cpp
View File

@ -34,7 +34,6 @@
#include "misc_log_ex.h" #include "misc_log_ex.h"
#include "daemon/daemon.h" #include "daemon/daemon.h"
#include "rpc/daemon_handler.h" #include "rpc/daemon_handler.h"
#include "rpc/zmq_server.h"
#include "common/password.h" #include "common/password.h"
#include "common/util.h" #include "common/util.h"
@ -170,11 +169,10 @@ bool t_daemon::run(bool interactive)
} }
cryptonote::rpc::DaemonHandler rpc_daemon_handler(mp_internals->core.get(), mp_internals->p2p.get()); cryptonote::rpc::DaemonHandler rpc_daemon_handler(mp_internals->core.get(), mp_internals->p2p.get());
cryptonote::rpc::ZmqServer zmq_server(rpc_daemon_handler);
if (!zmq_rpc_disabled) if (false)
{ {
if (!zmq_server.addTCPSocket(zmq_rpc_bind_address, zmq_rpc_bind_port)) if (false)
{ {
LOG_ERROR(std::string("Failed to add TCP Socket (") + zmq_rpc_bind_address LOG_ERROR(std::string("Failed to add TCP Socket (") + zmq_rpc_bind_address
+ ":" + zmq_rpc_bind_port + ") to ZMQ RPC Server"); + ":" + zmq_rpc_bind_port + ") to ZMQ RPC Server");
@ -189,7 +187,6 @@ bool t_daemon::run(bool interactive)
} }
MINFO("Starting ZMQ server..."); MINFO("Starting ZMQ server...");
zmq_server.run();
MINFO(std::string("ZMQ server started at ") + zmq_rpc_bind_address MINFO(std::string("ZMQ server started at ") + zmq_rpc_bind_address
+ ":" + zmq_rpc_bind_port + "."); + ":" + zmq_rpc_bind_port + ".");
@ -208,9 +205,6 @@ bool t_daemon::run(bool interactive)
if (rpc_commands) if (rpc_commands)
rpc_commands->stop_handling(); rpc_commands->stop_handling();
if (!zmq_rpc_disabled)
zmq_server.stop();
for(auto& rpc : mp_internals->rpcs) for(auto& rpc : mp_internals->rpcs)
rpc->stop(); rpc->stop();
MGINFO("Node stopped."); MGINFO("Node stopped.");

6
src/net/CMakeLists.txt
View File

@ -27,10 +27,10 @@
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set(net_sources dandelionpp.cpp error.cpp i2p_address.cpp parse.cpp socks.cpp set(net_sources dandelionpp.cpp error.cpp i2p_address.cpp parse.cpp socks.cpp
socks_connect.cpp tor_address.cpp zmq.cpp) socks_connect.cpp tor_address.cpp)
set(net_headers dandelionpp.h error.h i2p_address.h parse.h socks.h socks_connect.h set(net_headers dandelionpp.h error.h i2p_address.h parse.h socks.h socks_connect.h
tor_address.h zmq.h) tor_address.h)
monero_add_library(net ${net_sources} ${net_headers}) monero_add_library(net ${net_sources} ${net_headers})
target_link_libraries(net common epee ${ZMQ_LIB} ${Boost_ASIO_LIBRARY}) target_link_libraries(net common epee ${Boost_ASIO_LIBRARY})

7
src/rpc/CMakeLists.txt
View File

@ -44,8 +44,7 @@ set(daemon_messages_sources
daemon_messages.cpp) daemon_messages.cpp)
set(daemon_rpc_server_sources set(daemon_rpc_server_sources
daemon_handler.cpp daemon_handler.cpp)
zmq_server.cpp)
set(rpc_base_headers set(rpc_base_headers
@ -73,8 +72,7 @@ set(daemon_messages_private_headers
set(daemon_rpc_server_private_headers set(daemon_rpc_server_private_headers
message.h message.h
daemon_messages.h daemon_messages.h
daemon_handler.h daemon_handler.h)
zmq_server.h)
monero_private_headers(rpc monero_private_headers(rpc
@ -148,7 +146,6 @@ target_link_libraries(daemon_rpc_server
${Boost_REGEX_LIBRARY} ${Boost_REGEX_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY} ${Boost_THREAD_LIBRARY}
${ZMQ_LIB}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
target_include_directories(daemon_rpc_server PUBLIC ${ZMQ_INCLUDE_PATH}) target_include_directories(daemon_rpc_server PUBLIC ${ZMQ_INCLUDE_PATH})
target_include_directories(obj_daemon_rpc_server PUBLIC ${ZMQ_INCLUDE_PATH}) target_include_directories(obj_daemon_rpc_server PUBLIC ${ZMQ_INCLUDE_PATH})