From 903a34eddeac642bb2fec193230043beef3595cb Mon Sep 17 00:00:00 2001
From: fuwa <fuwa25519@protonmail.com>
Date: Wed, 6 Nov 2019 14:25:36 +0800
Subject: [PATCH] remove zeromq completely

---
 CMakeLists.txt            |  3 +++
 src/daemon/CMakeLists.txt |  1 -
 src/daemon/daemon.cpp     | 10 ++--------
 src/net/CMakeLists.txt    |  6 +++---
 src/rpc/CMakeLists.txt    |  7 ++-----
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 372eb5171..c0ec0c2b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -970,6 +970,9 @@ find_library(NORM_LIBRARY norm)
 find_library(PROTOLIB_LIBRARY protolib)
 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)
   message(FATAL_ERROR "Could not find required header zmq.h")
 endif()
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index bc34d76e2..2385670d7 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -88,7 +88,6 @@ target_link_libraries(daemon
     ${Boost_REGEX_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
     ${CMAKE_THREAD_LIBS_INIT}
-    ${ZMQ_LIB}
     ${GNU_READLINE_LIBRARY}
     ${EXTRA_LIBRARIES}
     ${Blocks})
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index cb96b37b6..ff3a1f4b5 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -34,7 +34,6 @@
 #include "misc_log_ex.h"
 #include "daemon/daemon.h"
 #include "rpc/daemon_handler.h"
-#include "rpc/zmq_server.h"
 
 #include "common/password.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::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
             + ":" + zmq_rpc_bind_port + ") to ZMQ RPC Server");
@@ -189,7 +187,6 @@ bool t_daemon::run(bool interactive)
       }
 
       MINFO("Starting ZMQ server...");
-      zmq_server.run();
 
       MINFO(std::string("ZMQ server started at ") + zmq_rpc_bind_address
             + ":" + zmq_rpc_bind_port + ".");
@@ -208,9 +205,6 @@ bool t_daemon::run(bool interactive)
     if (rpc_commands)
       rpc_commands->stop_handling();
 
-    if (!zmq_rpc_disabled)
-      zmq_server.stop();
-
     for(auto& rpc : mp_internals->rpcs)
       rpc->stop();
     MGINFO("Node stopped.");
diff --git a/src/net/CMakeLists.txt b/src/net/CMakeLists.txt
index 1ce7118ad..7fd97af7e 100644
--- a/src/net/CMakeLists.txt
+++ b/src/net/CMakeLists.txt
@@ -27,10 +27,10 @@
 # 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
-    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
-    tor_address.h zmq.h)
+    tor_address.h)
 
 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})
 
diff --git a/src/rpc/CMakeLists.txt b/src/rpc/CMakeLists.txt
index ebb1e767f..bcceddacb 100644
--- a/src/rpc/CMakeLists.txt
+++ b/src/rpc/CMakeLists.txt
@@ -44,8 +44,7 @@ set(daemon_messages_sources
   daemon_messages.cpp)
 
 set(daemon_rpc_server_sources
-  daemon_handler.cpp
-  zmq_server.cpp)
+  daemon_handler.cpp)
 
 
 set(rpc_base_headers
@@ -73,8 +72,7 @@ set(daemon_messages_private_headers
 set(daemon_rpc_server_private_headers
   message.h
   daemon_messages.h
-  daemon_handler.h
-  zmq_server.h)
+  daemon_handler.h)
 
 
 monero_private_headers(rpc
@@ -148,7 +146,6 @@ target_link_libraries(daemon_rpc_server
     ${Boost_REGEX_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_THREAD_LIBRARY}
-    ${ZMQ_LIB}
     ${EXTRA_LIBRARIES})
 target_include_directories(daemon_rpc_server PUBLIC ${ZMQ_INCLUDE_PATH})
 target_include_directories(obj_daemon_rpc_server PUBLIC ${ZMQ_INCLUDE_PATH})