Moved addrQueue to network module

src/network/__init__.py

@@ -9,6 +9,7 @@ dandelion_ins = Dandelion()
 
 # network queues
 invQueue = MultiQueue()
+addrQueue = MultiQueue()
 
 __all__ = ["StoppableThread"]
 

src/network/addrthread.py

@@ -7,7 +7,7 @@ from six.moves import queue
 # magic imports!
 import connectionpool
 from protocol import assembleAddrMessage
-from queues import addrQueue  # FIXME: init with queue
+from network import addrQueue  # FIXME: init with queue
 
 from threads import StoppableThread
 

src/queues.py

@@ -6,10 +6,6 @@ import time
 from six.moves import queue
 
 
-from network.multiqueue import MultiQueue
-
-
-
 class ObjectProcessorQueue(queue.Queue):
     """Special queue class using lock for `.threads.objectProcessor`"""
 
@@ -43,7 +39,6 @@ addressGeneratorQueue = queue.Queue()
 #: `.network.ReceiveQueueThread` instances dump objects they hear
 #: on the network into this queue to be processed.
 objectProcessorQueue = ObjectProcessorQueue()
-addrQueue = MultiQueue()
 portCheckerQueue = queue.Queue()
 receiveDataQueue = queue.Queue()
 #: The address generator thread uses this queue to get information back