Remove zeromq macro/remnants

blur-network · Jun 19, 2019 · 5c84e0c · 5c84e0c
1 parent 66558e5
commit 5c84e0c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 49 deletions.
diff --git a/src/rpc/daemon_handler.cpp b/src/rpc/daemon_handler.cpp
@@ -768,7 +768,7 @@ namespace rpc
 
   void DaemonHandler::handle(const GetRPCVersion::Request& req, GetRPCVersion::Response& res)
   {
-    res.version = DAEMON_RPC_VERSION_ZMQ;
+    res.version = CORE_RPC_VERSION;
     res.status = Message::STATUS_OK;
   }
 

diff --git a/src/rpc/daemon_handler.h b/src/rpc/daemon_handler.h
@@ -29,7 +29,6 @@
 #pragma once
 
 #include "daemon_messages.h"
-#include "daemon_rpc_version.h"
 #include "rpc_handler.h"
 #include "cryptonote_core/cryptonote_core.h"
 #include "cryptonote_protocol/cryptonote_protocol_handler.h"

diff --git a/src/rpc/daemon_messages.h b/src/rpc/daemon_messages.h
@@ -31,7 +31,6 @@
 #include "message.h"
 #include "cryptonote_protocol/cryptonote_protocol_defs.h"
 #include "rpc/message_data_structs.h"
-#include "rpc/daemon_rpc_version.h"
 #include "cryptonote_basic/cryptonote_basic.h"
 
 #define BEGIN_RPC_MESSAGE_CLASS(classname) \

diff --git a/src/rpc/daemon_rpc_version.h b/src/rpc/daemon_rpc_version.h
diff --git a/src/rpc/message.cpp b/src/rpc/message.cpp
@@ -27,7 +27,6 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "message.h"
-#include "daemon_rpc_version.h"
 #include "serialization/json_object.h"
 
 #include "rapidjson/writer.h"
@@ -62,7 +61,6 @@ rapidjson::Value Message::toJson(rapidjson::Document& doc) const
 
   val.AddMember("status", rapidjson::StringRef(status.c_str()), al);
   val.AddMember("error_details", rapidjson::StringRef(error_details.c_str()), al);
-  INSERT_INTO_JSON_OBJECT(val, doc, rpc_version, DAEMON_RPC_VERSION_ZMQ);
 
   return val;
 }