Moved all communicator ext vars to KV

src/communicator/__init__.py

@@ -10,7 +10,8 @@ import config
 import logger
 import onionrpeers
 import onionrplugins as plugins
-from . import onlinepeers, uploadqueue
+from . import onlinepeers
+from . import uploadqueue
 from communicatorutils import servicecreator
 from communicatorutils import onionrcommunicatortimers
 from communicatorutils import downloadblocks
@@ -65,6 +66,8 @@ class OnionrCommunicatorDaemon:
         self.kv.put('shutdown', False)
         self.kv.put('onlinePeers', [])
         self.kv.put('offlinePeers', [])
+        self.kv.put('peerProfiles', [])
+        self.kv.put('connectTimes', {})
         self.kv.put('currentDownloading', [])
         self.kv.put('announceCache', {})
         self.kv.put('newPeers', [])
@@ -72,6 +75,8 @@ class OnionrCommunicatorDaemon:
         self.kv.put('blocksToUpload', [])
         self.kv.put('cooldownPeer', {})
         self.kv.put('generating_blocks', [])
+        self.kv.put('lastNodeSeen', None)
+        self.kv.put('startTime', epoch.get_epoch())
 
         if config.get('general.offline_mode', False):
             self.isOnline = False
@@ -89,23 +94,12 @@ class OnionrCommunicatorDaemon:
         # loop time.sleep delay in seconds
         self.delay = 1
 
-        # lists of connected peers and peers we know we can't reach currently
-        self.connectTimes = {}
-        # list of peer's profiles (onionrpeers.PeerProfile instances)
-        self.peerProfiles = []
-
         # amount of threads running by name, used to prevent too many
         self.threadCounts = {}
 
-        # timestamp when the last online node was seen
-        self.lastNodeSeen = None
-
         # Loads in and starts the enabled plugins
         plugins.reload()
 
-        # time app started running for info/statistics purposes
-        self.startTime = epoch.get_epoch()
-
         # extends our upload list and saves our list when Onionr exits
         uploadqueue.UploadQueue(self)
 
@@ -296,7 +290,7 @@ class OnionrCommunicatorDaemon:
 
     def getPeerProfileInstance(self, peer):
         """Gets a peer profile instance from the list of profiles"""
-        for i in self.peerProfiles:
+        for i in self.kv.get('peerProfiles'):
             # if the peer's profile is already loaded, return that
             if i.address == peer:
                 retData = i
@@ -305,19 +299,16 @@ class OnionrCommunicatorDaemon:
             # if the peer's profile is not loaded, return a new one.
             # connectNewPeer also adds it to the list on connect
             retData = onionrpeers.PeerProfiles(peer)
-            self.peerProfiles.append(retData)
+            self.kv.get('peerProfiles').append(retData)
         return retData
 
-    def getUptime(self):
-        return epoch.get_epoch() - self.startTime
-
     def heartbeat(self):
         """Show a heartbeat debug message."""
         logger.debug('Heartbeat. Node running for %s.' %
-                     humanreadabletime.human_readable_time(self.getUptime()))
+                     humanreadabletime.human_readable_time(
+                         self.kv.get('startTime')))
         self.decrementThreadCount('heartbeat')
 
 
 def startCommunicator(shared_state):
     OnionrCommunicatorDaemon(shared_state)
-

src/communicator/onlinepeers/onlinepeers.py

@@ -5,7 +5,7 @@ get online peers in a communicator instance
 import time
 from typing import TYPE_CHECKING
 
-from etc import humanreadabletime
+from etc.humanreadabletime import human_readable_time
 import logger
 if TYPE_CHECKING:
     from deadsimplekv import DeadSimpleKV
@@ -41,9 +41,8 @@ def get_online_peers(comm_inst: 'OnionrCommunicatorDaemon'):
     needed = max_peers - len(kv.get('onlinePeers'))
 
     last_seen = 'never'
-    if not isinstance(comm_inst.lastNodeSeen, type(None)):
-        last_seen = humanreadabletime.human_readable_time(
-            comm_inst.lastNodeSeen)
+    if not isinstance(kv.get('lastNodeSeen'), type(None)):
+        last_seen = human_readable_time(kv.get('lastNodeSeen'))
 
     for _ in range(needed):
         if len(kv.get('onlinePeers')) == 0:
@@ -62,5 +61,5 @@ def get_online_peers(comm_inst: 'OnionrCommunicatorDaemon'):
             except RecursionError:
                 pass
         else:
-            comm_inst.lastNodeSeen = time.time()
+            kv.put('lastNodeSeen', time.time())
     comm_inst.decrementThreadCount('get_online_peers')

src/communicator/onlinepeers/removeonlinepeer.py

@@ -26,7 +26,7 @@ def remove_online_peer(comm_inst, peer):
     """Remove an online peer."""
     kv: "DeadSimpleKV" = comm_inst.shared_state.get_by_string("DeadSimpleKV")
     try:
-        del comm_inst.connectTimes[peer]
+        del kv.get('connectTimes')[peer]
     except KeyError:
         pass
     try: