From 3cc49da6f13a6ae9f2168139e60d11a70da65608 Mon Sep 17 00:00:00 2001 From: "kuldeep.k@cisinlabs.com" Date: Thu, 2 Dec 2021 21:45:37 +0530 Subject: [PATCH] Fixed pylint, updated connectionpool & stats changes, added bitmessagemock file & moved mock folder to tests --- src/{ => tests}/mock/__init__.py | 0 src/tests/mock/bitmessagemock.py | 2 ++ src/{ => tests}/mock/class_addressGenerator.py | 0 src/{ => tests}/mock/class_objectProcessor.py | 1 + src/{ => tests}/mock/class_singleWorker.py | 3 ++- src/{ => tests}/mock/inventory.py | 2 +- src/{ => tests}/mock/kivy_main.py | 0 src/{ => tests}/mock/network/connectionpool.py | 8 +------- src/{ => tests}/mock/network/stats.py | 4 ++-- 9 files changed, 9 insertions(+), 11 deletions(-) rename src/{ => tests}/mock/__init__.py (100%) create mode 100644 src/tests/mock/bitmessagemock.py rename src/{ => tests}/mock/class_addressGenerator.py (100%) rename src/{ => tests}/mock/class_objectProcessor.py (97%) rename src/{ => tests}/mock/class_singleWorker.py (93%) rename src/{ => tests}/mock/inventory.py (86%) rename src/{ => tests}/mock/kivy_main.py (100%) rename src/{ => tests}/mock/network/connectionpool.py (63%) rename src/{ => tests}/mock/network/stats.py (71%) diff --git a/src/mock/__init__.py b/src/tests/mock/__init__.py similarity index 100% rename from src/mock/__init__.py rename to src/tests/mock/__init__.py diff --git a/src/tests/mock/bitmessagemock.py b/src/tests/mock/bitmessagemock.py new file mode 100644 index 00000000..4f023ea0 --- /dev/null +++ b/src/tests/mock/bitmessagemock.py @@ -0,0 +1,2 @@ +def main(): + pass \ No newline at end of file diff --git a/src/mock/class_addressGenerator.py b/src/tests/mock/class_addressGenerator.py similarity index 100% rename from src/mock/class_addressGenerator.py rename to src/tests/mock/class_addressGenerator.py diff --git a/src/mock/class_objectProcessor.py b/src/tests/mock/class_objectProcessor.py similarity index 97% rename from src/mock/class_objectProcessor.py rename to src/tests/mock/class_objectProcessor.py index 84958bb3..09120fc6 100644 --- a/src/mock/class_objectProcessor.py +++ b/src/tests/mock/class_objectProcessor.py @@ -43,6 +43,7 @@ class objectProcessor(threading.Thread): def run(self): """Process the objects from `.queues.objectProcessorQueue`""" while True: + # pylint: disable=unused-variable objectType, data = queues.objectProcessorQueue.get() if state.shutdown: diff --git a/src/mock/class_singleWorker.py b/src/tests/mock/class_singleWorker.py similarity index 93% rename from src/mock/class_singleWorker.py rename to src/tests/mock/class_singleWorker.py index af9b8d83..92ffffbd 100644 --- a/src/mock/class_singleWorker.py +++ b/src/tests/mock/class_singleWorker.py @@ -18,6 +18,7 @@ class MockSingleWorker(StoppableThread): def __init__(self): super(MockSingleWorker, self).__init__(name="singleWorker") proofofwork.init() + self.busy = None def stopThread(self): """Signal through the queue that the thread should be stopped""" @@ -35,7 +36,7 @@ class MockSingleWorker(StoppableThread): while state.shutdown == 0: self.busy = 0 - command, data = queues.workerQueue.get() + command, _ = queues.workerQueue.get() self.busy = 1 if command == 'stopThread': self.busy = 0 diff --git a/src/mock/inventory.py b/src/tests/mock/inventory.py similarity index 86% rename from src/mock/inventory.py rename to src/tests/mock/inventory.py index 04bceaf6..6468865d 100644 --- a/src/mock/inventory.py +++ b/src/tests/mock/inventory.py @@ -3,7 +3,7 @@ # TODO make this dynamic, and watch out for frozen, like with messagetypes from singleton import Singleton - +# pylint: disable=old-style-class,too-few-public-methods @Singleton class MockInventory(): """ diff --git a/src/mock/kivy_main.py b/src/tests/mock/kivy_main.py similarity index 100% rename from src/mock/kivy_main.py rename to src/tests/mock/kivy_main.py diff --git a/src/mock/network/connectionpool.py b/src/tests/mock/network/connectionpool.py similarity index 63% rename from src/mock/network/connectionpool.py rename to src/tests/mock/network/connectionpool.py index 1981f631..9aa16363 100644 --- a/src/mock/network/connectionpool.py +++ b/src/tests/mock/network/connectionpool.py @@ -9,17 +9,11 @@ from singleton import Singleton logger = logging.getLogger('default') - +# pylint: disable=too-few-public-methods @Singleton class MockBMConnectionPool(object): """Pool of all existing connections""" def __init__(self): - asyncore.set_rates( - BMConfigParser().safeGetInt( - "bitmessagesettings", "maxdownloadrate"), - BMConfigParser().safeGetInt( - "bitmessagesettings", "maxuploadrate") - ) self.outboundConnections = {} self.inboundConnections = {} diff --git a/src/mock/network/stats.py b/src/tests/mock/network/stats.py similarity index 71% rename from src/mock/network/stats.py rename to src/tests/mock/network/stats.py index a5fe9072..33dc4445 100644 --- a/src/mock/network/stats.py +++ b/src/tests/mock/network/stats.py @@ -3,11 +3,11 @@ Network statistics """ -def MockUploadSpeed(): +def uploadSpeed(): """Getting upload speed""" return 0 -def MockDownloadSpeed(): +def downloadSpeed(): """Getting download speed""" return 0