OnionrUtils fully removed (but not fully bug free)

flow now uses daemon thread for displaying output

onionr/coredb/blockmetadb/add.py

@@ -1,5 +1,5 @@
 import os, sqlite3
-import onionrutils
+from onionrutils import epoch, blockmetadata
 def add_to_block_DB(core_inst, newHash, selfInsert=False, dataSaved=False):
     '''
         Add a hash value to the block db
@@ -9,11 +9,11 @@ def add_to_block_DB(core_inst, newHash, selfInsert=False, dataSaved=False):
 
     if not os.path.exists(core_inst.blockDB):
         raise Exception('Block db does not exist')
-    if onionrutils.has_block(core_inst, newHash):
+    if blockmetadata.has_block(core_inst, newHash):
         return
     conn = sqlite3.connect(core_inst.blockDB, timeout=30)
     c = conn.cursor()
-    currentTime = core_inst._utils.getEpoch() + core_inst._crypto.secrets.randbelow(301)
+    currentTime = epoch.get_epoch() + core_inst._crypto.secrets.randbelow(301)
     if selfInsert or dataSaved:
         selfInsert = 1
     else:

onionr/coredb/blockmetadb/expiredblocks.py

@@ -1,9 +1,10 @@
 import sqlite3
+from onionrutils import epoch
 def get_expired_blocks(core_inst):
     '''Returns a list of expired blocks'''
     conn = sqlite3.connect(core_inst.blockDB, timeout=30)
     c = conn.cursor()
-    date = int(core_inst._utils.getEpoch())
+    date = int(epoch.get_epoch())
 
     execute = 'SELECT hash FROM hashes WHERE expire <= %s ORDER BY dateReceived;' % (date,)
 

onionr/coredb/daemonqueue/__init__.py

@@ -1,6 +1,6 @@
 import sqlite3, os
 import onionrevents as events
-from onionrutils import localcommand
+from onionrutils import localcommand, epoch
 
 def daemon_queue(core_inst):
     '''
@@ -38,7 +38,7 @@ def daemon_queue_add(core_inst, command, data='', responseID=''):
 
     retData = True
 
-    date = core_inst._utils.getEpoch()
+    date = epoch.get_epoch()
     conn = sqlite3.connect(core_inst.queueDB, timeout=30)
     c = conn.cursor()
     t = (command, data, date, responseID)

onionr/coredb/keydb/listkeys.py

@@ -1,5 +1,6 @@
 import sqlite3
 import logger
+from onionrutils import epoch
 def list_peers(core_inst, randomOrder=True, getPow=False, trust=0):
     '''
         Return a list of public keys (misleading function name)
@@ -56,7 +57,7 @@ def list_adders(core_inst, randomOrder=True, i2p=True, recent=0):
     testList = list(addressList) # create new list to iterate
     for address in testList:
         try:
-            if recent > 0 and (core_inst._utils.getEpoch() - core_inst.getAddressInfo(address, 'lastConnect')) > recent:
+            if recent > 0 and (epoch.get_epoch() - core_inst.getAddressInfo(address, 'lastConnect')) > recent:
                 raise TypeError # If there is no last-connected date or it was too long ago, don't add peer to list if recent is not 0
         except TypeError:
             addressList.remove(address)