From 49e89ecdf20586c15349644d271e9fa6fdab4deb Mon Sep 17 00:00:00 2001 From: anand k Date: Sun, 23 Jun 2024 10:57:57 +0530 Subject: [PATCH] Moved addrQueue to network module --- src/network/__init__.py | 1 + src/network/addrthread.py | 2 +- src/queues.py | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/network/__init__.py b/src/network/__init__.py index 642842df..073c8435 100644 --- a/src/network/__init__.py +++ b/src/network/__init__.py @@ -9,6 +9,7 @@ dandelion_ins = Dandelion() # network queues invQueue = MultiQueue() +addrQueue = MultiQueue() __all__ = ["StoppableThread"] diff --git a/src/network/addrthread.py b/src/network/addrthread.py index a77e609c..81e44506 100644 --- a/src/network/addrthread.py +++ b/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 diff --git a/src/queues.py b/src/queues.py index 8e46ccf0..18eb6dfa 100644 --- a/src/queues.py +++ b/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