Code clean up

Deletes debug/logging pair. Defines logging and bitcoin_cli as system-wide variables

pisa/utils/zmq_subscriber.py

@@ -0,0 +1,32 @@
+import zmq
+import binascii
+from pisa import logging
+from pisa.conf import FEED_PROTOCOL, FEED_ADDR, FEED_PORT
+
+
+# ToDo: #7-add-async-back-to-zmq
+class ZMQHandler:
+    """ Adapted from https://github.com/bitcoin/bitcoin/blob/master/contrib/zmq/zmq_sub.py"""
+    def __init__(self, parent):
+        self.zmqContext = zmq.Context()
+        self.zmqSubSocket = self.zmqContext.socket(zmq.SUB)
+        self.zmqSubSocket.setsockopt(zmq.RCVHWM, 0)
+        self.zmqSubSocket.setsockopt_string(zmq.SUBSCRIBE, "hashblock")
+        self.zmqSubSocket.connect("%s://%s:%s" % (FEED_PROTOCOL, FEED_ADDR, FEED_PORT))
+        self.parent = parent
+        self.terminate = False
+
+    def handle(self, block_queue):
+        while not self.terminate:
+            msg = self.zmqSubSocket.recv_multipart()
+
+            # Terminate could have been set wile the thread was blocked in recv
+            if not self.terminate:
+                topic = msg[0]
+                body = msg[1]
+
+                if topic == b"hashblock":
+                    block_hash = binascii.hexlify(body).decode('UTF-8')
+                    block_queue.put(block_hash)
+
+                    logging.info("[ZMQHandler-{}] new block received via ZMQ".format(self.parent, block_hash))