Made BMConnectionPool as global runtime variable in connectionpool from singleton

Author: anand-skss

src/api.py

@@ -96,9 +96,9 @@
 from highlevelcrypto import calculateInventoryHash
 
 try:
-    from network import BMConnectionPool
+    from network import connectionpool
 except ImportError:
-    BMConnectionPool = None
+    connectionpool = None
 
 from network import stats, StoppableThread
 from version import softwareVersion
@@ -1475,18 +1475,18 @@ def HandleListConnections(self):
         Returns bitmessage connection information as dict with keys *inbound*,
         *outbound*.
         """
-        if BMConnectionPool is None:
+        if connectionpool is None:
             raise APIError(21, 'Could not import BMConnectionPool.')
         inboundConnections = []
         outboundConnections = []
-        for i in BMConnectionPool().inboundConnections.values():
+        for i in connectionpool.pool.inboundConnections.values():
             inboundConnections.append({
                 'host': i.destination.host,
                 'port': i.destination.port,
                 'fullyEstablished': i.fullyEstablished,
                 'userAgent': str(i.userAgent)
             })
-        for i in BMConnectionPool().outboundConnections.values():
+        for i in connectionpool.pool.outboundConnections.values():
             outboundConnections.append({
                 'host': i.destination.host,
                 'port': i.destination.port,

src/bitmessageqt/networkstatus.py

@@ -10,7 +10,7 @@
 import network.stats
 import state
 import widgets
-from network import BMConnectionPool, knownnodes
+from network import connectionpool, knownnodes
 from retranslateui import RetranslateMixin
 from tr import _translate
 from uisignaler import UISignaler
@@ -148,16 +148,16 @@ def updateNetworkStatusTab(self, outbound, add, destination):
         # pylint: disable=too-many-branches,undefined-variable
         if outbound:
             try:
-                c = BMConnectionPool().outboundConnections[destination]
+                c = connectionpool.pool.outboundConnections[destination]
             except KeyError:
                 if add:
                     return
         else:
             try:
-                c = BMConnectionPool().inboundConnections[destination]
+                c = connectionpool.pool.inboundConnections[destination]
             except KeyError:
                 try:
-                    c = BMConnectionPool().inboundConnections[destination.host]
+                    c = connectionpool.pool.inboundConnections[destination.host]
                 except KeyError:
                     if add:
                         return
@@ -201,7 +201,7 @@ def updateNetworkStatusTab(self, outbound, add, destination):
             self.tableWidgetConnectionCount.item(0, 0).setData(QtCore.Qt.UserRole, destination)
             self.tableWidgetConnectionCount.item(0, 1).setData(QtCore.Qt.UserRole, outbound)
         else:
-            if not BMConnectionPool().inboundConnections:
+            if not connectionpool.pool.inboundConnections:
                 self.window().setStatusIcon('yellow')
             for i in range(self.tableWidgetConnectionCount.rowCount()):
                 if self.tableWidgetConnectionCount.item(i, 0).data(QtCore.Qt.UserRole).toPyObject() != destination:

src/bitmessageqt/settings.py

@@ -20,7 +20,8 @@
 from bmconfigparser import config as config_obj
 from helper_sql import sqlExecute, sqlStoredProcedure
 from helper_startup import start_proxyconfig
-from network import knownnodes, AnnounceThread
+from network import knownnodes
+from network.announcethread import AnnounceThread
 from network.asyncore_pollchoose import set_rates
 from tr import _translate
 

src/class_singleCleaner.py

@@ -27,7 +27,7 @@
 import state
 from bmconfigparser import config
 from helper_sql import sqlExecute, sqlQuery
-from network import BMConnectionPool, knownnodes, StoppableThread
+from network import connectionpool, knownnodes, StoppableThread
 from tr import _translate
 
 
@@ -129,7 +129,7 @@ def run(self):  # pylint: disable=too-many-branches
                         os._exit(1)  # pylint: disable=protected-access
 
             # inv/object tracking
-            for connection in BMConnectionPool().connections():
+            for connection in connectionpool.pool.connections():
                 connection.clean()
 
             # discovery tracking

src/network/__init__.py

@@ -2,21 +2,17 @@
 Network subsystem package
 """
 
-try:
-    from .announcethread import AnnounceThread
-    from .connectionpool import BMConnectionPool
-except ImportError:
-    AnnounceThread = None
-    BMConnectionPool = None
 from .threads import StoppableThread
 
 
-__all__ = ["AnnounceThread", "BMConnectionPool", "StoppableThread"]
+__all__ = ["StoppableThread"]
 
 
 def start(config, state):
     """Start network threads"""
     import state
+    from .announcethread import AnnounceThread
+    import connectionpool  # pylint: disable=relative-import
     from .addrthread import AddrThread
     from .dandelion import Dandelion
     from .downloadthread import DownloadThread
@@ -29,7 +25,7 @@ def start(config, state):
     readKnownNodes()
     # init, needs to be early because other thread may access it early
     state.Dandelion = Dandelion()
-    BMConnectionPool().connectToStream(1)
+    connectionpool.pool.connectToStream(1)
     for thread in (
         BMNetworkThread(), InvThread(), AddrThread(),
         DownloadThread(), UploadThread()

src/network/addrthread.py

@@ -5,10 +5,10 @@
 
 # magic imports!
 import state
+import connectionpool
 from helper_random import randomshuffle
 from protocol import assembleAddrMessage
 from queues import addrQueue  # FIXME: init with queue
-from network.connectionpool import BMConnectionPool
 
 from threads import StoppableThread
 
@@ -29,7 +29,7 @@ def run(self):
 
             if chunk:
                 # Choose peers randomly
-                connections = BMConnectionPool().establishedConnections()
+                connections = connectionpool.pool.establishedConnections()
                 randomshuffle(connections)
                 for i in connections:
                     randomshuffle(chunk)

src/network/announcethread.py

@@ -5,9 +5,9 @@
 
 # magic imports!
 import state
+import connectionpool
 from bmconfigparser import config
 from protocol import assembleAddrMessage
-from network.connectionpool import BMConnectionPool
 
 from node import Peer
 from threads import StoppableThread
@@ -31,7 +31,7 @@ def run(self):
     @staticmethod
     def announceSelf():
         """Announce our presence"""
-        for connection in BMConnectionPool().udpSockets.values():
+        for connection in connectionpool.pool.udpSockets.values():
             if not connection.announcing:
                 continue
             for stream in state.streamsInWhichIAmParticipating:

src/network/bmproto.py

@@ -12,10 +12,10 @@
 
 # magic imports!
 import addresses
-import connectionpool
 import knownnodes
 import protocol
 import state
+import connectionpool
 from bmconfigparser import config
 from queues import invQueue, objectProcessorQueue, portCheckerQueue
 from randomtrackingdict import RandomTrackingDict
@@ -540,7 +540,7 @@ def bm_command_version(self):
         if not self.isOutbound:
             self.append_write_buf(protocol.assembleVersionMessage(
                 self.destination.host, self.destination.port,
-                connectionpool.BMConnectionPool().streams, True,
+                connectionpool.pool.streams, True,
                 nodeid=self.nodeid))
             logger.debug(
                 '%(host)s:%(port)i sending version',
@@ -596,7 +596,7 @@ def peerValidityChecks(self):
                 'Closed connection to %s because there is no overlapping'
                 ' interest in streams.', self.destination)
             return False
-        if connectionpool.BMConnectionPool().inboundConnections.get(
+        if connectionpool.pool.inboundConnections.get(
                 self.destination):
             try:
                 if not protocol.checkSocksIP(self.destination.host):
@@ -614,8 +614,8 @@ def peerValidityChecks(self):
             # or server full report the same error to counter deanonymisation
             if (
                 Peer(self.destination.host, self.peerNode.port)
-                in connectionpool.BMConnectionPool().inboundConnections
-                or len(connectionpool.BMConnectionPool())
+                in connectionpool.pool.inboundConnections
+                or len(connectionpool.pool)
                 > config.safeGetInt(
                     'bitmessagesettings', 'maxtotalconnections')
                 + config.safeGetInt(
@@ -627,7 +627,7 @@ def peerValidityChecks(self):
                     'Closed connection to %s due to server full'
                     ' or duplicate inbound/outbound.', self.destination)
                 return False
-        if connectionpool.BMConnectionPool().isAlreadyConnected(self.nonce):
+        if connectionpool.pool.isAlreadyConnected(self.nonce):
             self.append_write_buf(protocol.assembleErrorMessage(
                 errorText="I'm connected to myself. Closing connection.",
                 fatal=2))
@@ -641,7 +641,7 @@ def peerValidityChecks(self):
     @staticmethod
     def stopDownloadingObject(hashId, forwardAnyway=False):
         """Stop downloading object *hashId*"""
-        for connection in connectionpool.BMConnectionPool().connections():
+        for connection in connectionpool.pool.connections():
             try:
                 del connection.objectsNewToMe[hashId]
             except KeyError:

src/network/connectionpool.py

@@ -17,7 +17,6 @@
 from connectionchooser import chooseConnection
 from node import Peer
 from proxy import Proxy
-from singleton import Singleton
 from tcp import (
     bootstrap, Socks4aBMConnection, Socks5BMConnection,
     TCPConnection, TCPServer)
@@ -26,7 +25,6 @@
 logger = logging.getLogger('default')
 
 
-@Singleton
 class BMConnectionPool(object):
     """Pool of all existing connections"""
     # pylint: disable=too-many-instance-attributes
@@ -403,3 +401,6 @@ def loop(self):  # pylint: disable=too-many-branches,too-many-statements
                     pass
         for i in reaper:
             self.removeConnection(i)
+
+
+pool = BMConnectionPool()

src/network/downloadthread.py

@@ -6,7 +6,7 @@
 import addresses
 import helper_random
 import protocol
-from network.connectionpool import BMConnectionPool
+import connectionpool
 from objectracker import missingObjects
 from threads import StoppableThread
 
@@ -41,7 +41,7 @@ def run(self):
         while not self._stopped:
             requested = 0
             # Choose downloading peers randomly
-            connections = BMConnectionPool().establishedConnections()
+            connections = connectionpool.pool.establishedConnections()
             helper_random.randomshuffle(connections)
             requestChunk = max(int(
                 min(self.maxRequestChunk, len(missingObjects))