From 3fba3fec571565c35b70db94aebec29012df5659 Mon Sep 17 00:00:00 2001
From: Oran Juice <oranjuices@hotmail.com>
Date: Sat, 24 Jan 2015 16:43:33 +0530
Subject: [PATCH] 0MQ end-to-end test works!

---
 src/ipc/daemon_ipc_handlers.cpp       |  2 +-
 src/ipc/include/wap_client_engine.inc | 29 +++++++++++++++------------
 src/wallet/wallet2.h                  |  1 +
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/ipc/daemon_ipc_handlers.cpp b/src/ipc/daemon_ipc_handlers.cpp
index b10c327a4..e3175c9db 100644
--- a/src/ipc/daemon_ipc_handlers.cpp
+++ b/src/ipc/daemon_ipc_handlers.cpp
@@ -70,7 +70,7 @@ namespace IPC
 
     void getblocks(wap_proto_t *message)
     {
-
+      
     }
 
     void sendtransactions(wap_proto_t *message)
diff --git a/src/ipc/include/wap_client_engine.inc b/src/ipc/include/wap_client_engine.inc
index c8dc78a7f..995ae8e88 100644
--- a/src/ipc/include/wap_client_engine.inc
+++ b/src/ipc/include/wap_client_engine.inc
@@ -56,7 +56,7 @@ typedef enum {
     start_ok_event = 16,
     stop_ok_event = 17,
     close_ok_event = 18,
-    connection_pong_event = 19,
+    ping_ok_event = 19,
     error_event = 20,
     command_invalid_event = 21,
     other_event = 22
@@ -102,7 +102,7 @@ s_event_name [] = {
     "START_OK",
     "STOP_OK",
     "CLOSE_OK",
-    "connection_pong",
+    "PING_OK",
     "ERROR",
     "command_invalid",
     "other"
@@ -407,6 +407,9 @@ s_protocol_event (s_client_t *self, wap_proto_t *message)
         case WAP_PROTO_CLOSE_OK:
             return close_ok_event;
             break;
+        case WAP_PROTO_PING_OK:
+            return ping_ok_event;
+            break;
         case WAP_PROTO_ERROR:
             return error_event;
             break;
@@ -525,7 +528,7 @@ s_client_execute (s_client_t *self, event_t event)
                     }
                 }
                 else
-                if (self->event == connection_pong_event) {
+                if (self->event == ping_ok_event) {
                 }
                 else
                 if (self->event == error_event) {
@@ -668,7 +671,7 @@ s_client_execute (s_client_t *self, event_t event)
                     }
                 }
                 else
-                if (self->event == connection_pong_event) {
+                if (self->event == ping_ok_event) {
                 }
                 else
                 if (self->event == error_event) {
@@ -698,7 +701,7 @@ s_client_execute (s_client_t *self, event_t event)
                         self->state = connected_state;
                 }
                 else
-                if (self->event == connection_pong_event) {
+                if (self->event == ping_ok_event) {
                 }
                 else
                 if (self->event == error_event) {
@@ -728,7 +731,7 @@ s_client_execute (s_client_t *self, event_t event)
                         self->state = connected_state;
                 }
                 else
-                if (self->event == connection_pong_event) {
+                if (self->event == ping_ok_event) {
                 }
                 else
                 if (self->event == error_event) {
@@ -758,7 +761,7 @@ s_client_execute (s_client_t *self, event_t event)
                         self->state = connected_state;
                 }
                 else
-                if (self->event == connection_pong_event) {
+                if (self->event == ping_ok_event) {
                 }
                 else
                 if (self->event == error_event) {
@@ -788,7 +791,7 @@ s_client_execute (s_client_t *self, event_t event)
                         self->state = connected_state;
                 }
                 else
-                if (self->event == connection_pong_event) {
+                if (self->event == ping_ok_event) {
                 }
                 else
                 if (self->event == error_event) {
@@ -818,7 +821,7 @@ s_client_execute (s_client_t *self, event_t event)
                         self->state = connected_state;
                 }
                 else
-                if (self->event == connection_pong_event) {
+                if (self->event == ping_ok_event) {
                 }
                 else
                 if (self->event == error_event) {
@@ -848,7 +851,7 @@ s_client_execute (s_client_t *self, event_t event)
                         self->state = connected_state;
                 }
                 else
-                if (self->event == connection_pong_event) {
+                if (self->event == ping_ok_event) {
                 }
                 else
                 if (self->event == error_event) {
@@ -897,7 +900,7 @@ s_client_execute (s_client_t *self, event_t event)
                     }
                 }
                 else
-                if (self->event == connection_pong_event) {
+                if (self->event == ping_ok_event) {
                 }
                 else
                 if (self->event == error_event) {
@@ -916,7 +919,7 @@ s_client_execute (s_client_t *self, event_t event)
                 break;
 
             case defaults_state:
-                if (self->event == connection_pong_event) {
+                if (self->event == ping_ok_event) {
                 }
                 else
                 if (self->event == error_event) {
@@ -987,7 +990,7 @@ s_client_execute (s_client_t *self, event_t event)
                         self->state = connected_state;
                 }
                 else
-                if (self->event == connection_pong_event) {
+                if (self->event == ping_ok_event) {
                 }
                 else
                 if (self->event == error_event) {
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index db2c97d18..271229976 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -90,6 +90,7 @@ namespace tools
         // TODO: Daemon not up.
       }
       int rc = wap_client_start (client, 25);
+      std::cout << "\n\n Response: " << (int)wap_client_curr_height(client) << std::endl;
       assert (rc == 0);
     };
     struct transfer_details