Disable multiple threads

Author: jleni

pytest.ini

@@ -1,5 +1,5 @@
 # content of pytest.ini
 [pytest]
-addopts = --doctest-modules -sv -n 8
+addopts = --doctest-modules -sv
 testpaths = tests src/qrl
 norecursedirs = qrl/generated

setup.cfg

@@ -51,7 +51,6 @@ tests_require =
     pytest
     pytest-cov
     pytest-flake8
-    pytest-xdist
     flake8
     autoflake
     timeout-decorator

src/qrl/core/p2p/p2pPeerManager.py

@@ -9,6 +9,7 @@
 
 from qrl.core import config
 from qrl.core.misc import logger, ntp
+from qrl.core.misc.expiring_set import ExpiringSet
 from qrl.core.misc.helper import parse_peer_addr
 from qrl.core.notification.Observable import Observable
 from qrl.core.notification.ObservableEvent import ObservableEvent
@@ -32,6 +33,10 @@ def __init__(self):
         self.peers_path = os.path.join(config.user.data_dir,
                                        config.dev.peers_filename)
 
+        self.banned_peers_filename = os.path.join(config.user.wallet_dir, config.dev.banned_peers_filename)
+        self._banned_peers = ExpiringSet(expiration_time=config.user.ban_minutes * 60,
+                                         filename=self.banned_peers_filename)
+
         self._observable = Observable(self)
         self._p2pfactory = None
 
@@ -80,8 +85,8 @@ def get_valid_peers(peer_ips, peer_ip, public_port):
             try:
                 parse_peer_addr(ip_port, True)
                 new_peers.add(ip_port)
-            except Exception as _:
-                logger.warning("Invalid Peer Address {} sent by {}".format(ip_port, peer_ip))
+            except Exception as e:
+                logger.warning("Invalid Peer Address {} sent by {} - {}".format(ip_port, peer_ip, e))
 
         return new_peers
 
@@ -242,3 +247,31 @@ def handle_p2p_acknowledgement(self, source, message: qrllegacy_pb2.LegacyMessag
             source.loseConnection()
 
         source.send_next()
+
+    ####################################################
+    ####################################################
+    ####################################################
+    ####################################################
+    def is_banned(self, addr_remote: str):
+        return addr_remote in self._banned_peers
+
+    def ban_peer(self, peer_obj):
+        self._banned_peers.add(peer_obj.addr_remote)
+        logger.warning('Banned %s', peer_obj.addr_remote)
+        peer_obj.loseConnection()
+
+    def connect_peers(self):
+        logger.info('<<<Reconnecting to peer list: %s', self.peer_addresses)
+        for peer_address in self.peer_addresses:
+            if self.is_banned(peer_address):
+                continue
+            self._p2pfactory.connect_peer(peer_address)
+
+    def get_peers_stat(self) -> list:
+        peers_stat = []
+        for source in self.peer_node_status:
+            peer_stat = qrl_pb2.PeerStat(peer_ip=source.peer_ip.encode(),
+                                         port=source.peer_port,
+                                         node_chain_state=self.peer_node_status[source])
+            peers_stat.append(peer_stat)
+        return peers_stat

src/qrl/core/qrlnode.py

@@ -44,10 +44,6 @@ def __init__(self, db_state: State, mining_address: bytes):
 
         self.mining_address = mining_address
 
-        banned_peers_filename = os.path.join(config.user.wallet_dir, config.dev.banned_peers_filename)
-        self._banned_peers = ExpiringSet(expiration_time=config.user.ban_minutes * 60,
-                                         filename=banned_peers_filename)
-
         reactor.callLater(10, self.monitor_chain_state)
 
     ####################################################
@@ -57,7 +53,6 @@ def __init__(self, db_state: State, mining_address: bytes):
 
     @property
     def version(self):
-        # FIXME: Move to __version__ coming from pip
         return config.dev.version
 
     @property
@@ -140,37 +135,26 @@ def coin_supply_max(self):
         # FIXME: Keep a moving var
         return config.dev.max_coin_supply
 
+    ####################################################
+    ####################################################
+    ####################################################
+    ####################################################
+
     @property
     def peer_addresses(self):
         return self.peer_manager.peer_addresses
 
     def get_peers_stat(self) -> list:
-        peers_stat = []
-        for source in self.peer_manager.peer_node_status:
-            peer_stat = qrl_pb2.PeerStat(peer_ip=source.peer_ip.encode(),
-                                         port=source.peer_port,
-                                         node_chain_state=self.peer_manager.peer_node_status[source])
-            peers_stat.append(peer_stat)
-        return peers_stat
+        return self.peer_manager.get_peers_stat()
 
-    ####################################################
-    ####################################################
-    ####################################################
-    ####################################################
     def is_banned(self, addr_remote: str):
-        return addr_remote in self._banned_peers
+        return self.peer_manager.is_banned(addr_remote)
 
     def ban_peer(self, peer_obj):
-        self._banned_peers.add(peer_obj.addr_remote)
-        logger.warning('Banned %s', peer_obj.addr_remote)
-        peer_obj.loseConnection()
+        self.peer_manager.ban_peer(peer_obj)
 
     def connect_peers(self):
-        logger.info('<<<Reconnecting to peer list: %s', self.peer_addresses)
-        for peer_address in self.peer_addresses:
-            if self.is_banned(peer_address):
-                continue
-            self._p2pfactory.connect_peer(peer_address)
+        self.peer_manager.connect_peers()
 
     ####################################################
     ####################################################