From 5bde99967b5f0ba961807580240d2fd758622cb3 Mon Sep 17 00:00:00 2001
From: Kevin <beardog@mailbox.org>
Date: Wed, 29 Jul 2020 04:32:09 -0500
Subject: [PATCH] Moved all communicator ext vars to KV

---
 src/communicator/__init__.py                     | 4 ++--
 src/communicatorutils/downloadblocks/__init__.py | 2 +-
 src/communicatorutils/lookupblocks.py            | 2 +-
 src/communicatorutils/netcheck.py                | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/communicator/__init__.py b/src/communicator/__init__.py
index b887e6fa..77d2f277 100755
--- a/src/communicator/__init__.py
+++ b/src/communicator/__init__.py
@@ -57,7 +57,6 @@ class OnionrCommunicatorDaemon:
 
         # configure logger and stuff
         self.config = config
-        self.isOnline = True  # Assume we're connected to the internet
         self.shared_state = shared_state  # TooManyObjects module
 
         # populate kv values
@@ -77,9 +76,10 @@ class OnionrCommunicatorDaemon:
         self.kv.put('generating_blocks', [])
         self.kv.put('lastNodeSeen', None)
         self.kv.put('startTime', epoch.get_epoch())
+        self.kv.put('isOnline', True)
 
         if config.get('general.offline_mode', False):
-            self.isOnline = False
+            self.kv.put('isOnline', False)
 
         # list of timer instances
         self.timers = []
diff --git a/src/communicatorutils/downloadblocks/__init__.py b/src/communicatorutils/downloadblocks/__init__.py
index 79b43061..0a1b8fb3 100755
--- a/src/communicatorutils/downloadblocks/__init__.py
+++ b/src/communicatorutils/downloadblocks/__init__.py
@@ -63,7 +63,7 @@ def download_blocks_from_communicator(comm_inst: "OnionrCommunicatorDaemon"):
         if not shoulddownload.should_download(comm_inst, blockHash):
             continue
 
-        if kv.get('shutdown') or not comm_inst.isOnline or \
+        if kv.get('shutdown') or not kv.get('isOnline') or \
                 storage_counter.is_full():
             # Exit loop if shutting down or offline, or disk allocation reached
             break
diff --git a/src/communicatorutils/lookupblocks.py b/src/communicatorutils/lookupblocks.py
index adf0d46f..377695b8 100755
--- a/src/communicatorutils/lookupblocks.py
+++ b/src/communicatorutils/lookupblocks.py
@@ -56,7 +56,7 @@ def lookup_blocks_from_communicator(comm_inst):
         listLookupCommand = 'getblocklist'
         if len(kv.get('blockQueue')) >= maxBacklog:
             break
-        if not comm_inst.isOnline:
+        if not kv.get('isOnline'):
             break
         # check if disk allocation is used
         if storage_counter.is_full():
diff --git a/src/communicatorutils/netcheck.py b/src/communicatorutils/netcheck.py
index 930e588b..01eca304 100755
--- a/src/communicatorutils/netcheck.py
+++ b/src/communicatorutils/netcheck.py
@@ -42,7 +42,7 @@ def net_check(comm_inst):
         try:
             if (epoch.get_epoch() - int(localcommand.local_command
                                         ('/lastconnect'))) <= 60:
-                comm_inst.isOnline = True
+                kv.put('isOnline', True)
                 rec = True
         except ValueError:
             pass
@@ -55,7 +55,7 @@ def net_check(comm_inst):
                                 terminal=True)
                     restarttor.restart(comm_inst)
                     kv.put('offlinePeers', [])
-            comm_inst.isOnline = False
+            kv.put('isOnline', False)
         else:
-            comm_inst.isOnline = True
+            kv.put('isOnline', True)
     comm_inst.decrementThreadCount('net_check')