Replaced state.streamsInWhichIAmParticipating with pool.streams

src/bitmessagemain.py

@@ -237,8 +237,7 @@ class Main(object):
                 upnpThread = upnp.uPnPThread()
                 upnpThread.start()
         else:
-            # Populate with hardcoded value (same as connectToStream above)
+            network.connectionpool.pool.connectToStream(1)
-            state.streamsInWhichIAmParticipating.append(1)
 
         if not daemon and state.enableGUI:
             if state.curses:

src/bitmessageqt/settings.py

@@ -20,7 +20,7 @@ import widgets
 from bmconfigparser import config as config_obj
 from helper_sql import sqlExecute, sqlStoredProcedure
 from helper_startup import start_proxyconfig
-from network import knownnodes
+from network import connectionpool, knownnodes
 from network.announcethread import AnnounceThread
 from network.asyncore_pollchoose import set_rates
 from tr import _translate
@@ -165,7 +165,7 @@ class SettingsDialog(QtGui.QDialog):
         if self._proxy_type:
             for node, info in six.iteritems(
                 knownnodes.knownNodes.get(
-                    min(state.streamsInWhichIAmParticipating), [])
+                    min(connectionpool.pool.streams), [])
             ):
                 if (
                     node.host.endswith('.onion') and len(node.host) > 22

src/class_singleCleaner.py

@@ -108,7 +108,7 @@ class singleCleaner(StoppableThread):
                 # Cleanup knownnodes and handle possible severe exception
                 # while writing it to disk
                 if state.enableNetwork:
-                    knownnodes.cleanupKnownNodes()
+                    knownnodes.cleanupKnownNodes(connectionpool.pool)
             except Exception as err:
                 if "Errno 28" in str(err):
                     self.logger.fatal(

src/network/announcethread.py

@@ -4,7 +4,6 @@ Announce myself (node address)
 import time
 
 # magic imports!
-import state
 import connectionpool
 from bmconfigparser import config
 from protocol import assembleAddrMessage
@@ -34,7 +33,7 @@ class AnnounceThread(StoppableThread):
         for connection in connectionpool.pool.udpSockets.values():
             if not connection.announcing:
                 continue
-            for stream in state.streamsInWhichIAmParticipating:
+            for stream in connectionpool.pool.streams:
                 addr = (
                     stream,
                     Peer(

src/network/bmobject.py

@@ -6,6 +6,7 @@ import time
 
 import protocol
 import state
+import connectionpool
 from highlevelcrypto import calculateInventoryHash
 
 logger = logging.getLogger('default')
@@ -98,7 +99,7 @@ class BMObject(object):  # pylint: disable=too-many-instance-attributes
             logger.warning(
                 'The object has invalid stream: %s', self.streamNumber)
             raise BMObjectInvalidError()
-        if self.streamNumber not in state.streamsInWhichIAmParticipating:
+        if self.streamNumber not in connectionpool.pool.streams:
             logger.debug(
                 'The streamNumber %i isn\'t one we are interested in.',
                 self.streamNumber)

src/network/bmproto.py

@@ -445,7 +445,7 @@ class BMProto(AdvancedDispatcher, ObjectTracker):
         for seenTime, stream, _, ip, port in self._decode_addr():
             ip = str(ip)
             if (
-                stream not in state.streamsInWhichIAmParticipating
+                stream not in connectionpool.pool.streams
                 # FIXME: should check against complete list
                 or ip.startswith('bootstrap')
             ):

src/network/connectionpool.py

@@ -88,7 +88,6 @@ class BMConnectionPool(object):
     def connectToStream(self, streamNumber):
         """Connect to a bitmessage stream"""
         self.streams.append(streamNumber)
-        state.streamsInWhichIAmParticipating.append(streamNumber)
 
     def getConnectionByAddr(self, addr):
         """

src/network/knownnodes.py

@@ -226,7 +226,7 @@ def dns():
             1, Peer('bootstrap%s.bitmessage.org' % port, port))
 
 
-def cleanupKnownNodes():
+def cleanupKnownNodes(pool):
     """
     Cleanup knownnodes: remove old nodes and nodes with low rating
     """
@@ -236,7 +236,7 @@ def cleanupKnownNodes():
 
     with knownNodesLock:
         for stream in knownNodes:
-            if stream not in state.streamsInWhichIAmParticipating:
+            if stream not in pool.streams:
                 continue
             keys = knownNodes[stream].keys()
             for node in keys:

src/network/udp.py

@@ -8,6 +8,7 @@ import time
 # magic imports!
 import protocol
 import state
+import connectionpool
 from queues import receiveDataQueue
 
 from bmproto import BMProto
@@ -81,7 +82,7 @@ class UDPSocket(BMProto):  # pylint: disable=too-many-instance-attributes
         remoteport = False
         for seenTime, stream, _, ip, port in addresses:
             decodedIP = protocol.checkIPAddress(str(ip))
-            if stream not in state.streamsInWhichIAmParticipating:
+            if stream not in connectionpool.pool.streams:
                 continue
             if (seenTime < time.time() - protocol.MAX_TIME_OFFSET
                     or seenTime > time.time() + protocol.MAX_TIME_OFFSET):

src/state.py

@@ -3,7 +3,6 @@ Global runtime variables.
 """
 
 neededPubkeys = {}
-streamsInWhichIAmParticipating = []
 
 extPort = None
 """For UPnP"""

src/tests/core.py

@@ -165,7 +165,7 @@ class TestCore(unittest.TestCase):
         """test knownnodes starvation leading to IndexError in Asyncore"""
         self._outdate_knownnodes()
         # time.sleep(303)  # singleCleaner wakes up every 5 min
-        knownnodes.cleanupKnownNodes()
+        knownnodes.cleanupKnownNodes(connectionpool.pool)
         self.assertTrue(knownnodes.knownNodes[1])
         while True:
             try:
@@ -179,7 +179,7 @@ class TestCore(unittest.TestCase):
         config.set('bitmessagesettings', 'dontconnect', 'true')
         self._wipe_knownnodes()
         knownnodes.addKnownNode(1, Peer('127.0.0.1', 8444), is_self=True)
-        knownnodes.cleanupKnownNodes()
+        knownnodes.cleanupKnownNodes(connectionpool.pool)
         time.sleep(5)
 
     def _check_connection(self, full=False):