progress in removing core

onionr/communicatorutils/announcenode.py

@@ -21,6 +21,7 @@ import base64
 import onionrproofs, logger
 from etc import onionrvalues
 from onionrutils import basicrequests, bytesconverter
+from utils import gettransports
 from communicator import onlinepeers
 from coredb import keydb
 def announce_node(daemon):
@@ -43,7 +44,10 @@ def announce_node(daemon):
             peer = onlinepeers.pick_online_peer(daemon)
 
         for x in range(1):
-            ourID = daemon.hsAddress
+            try:
+                ourID = gettransports.get()[0]
+            except IndexError:
+                break
 
             url = 'http://' + peer + '/announce'
             data = {'node': ourID}

onionr/communicatorutils/connectnewpeers.py

@@ -57,7 +57,7 @@ def connect_new_peer_to_communicator(comm_inst, peer='', useBootstrap=False):
         if not config.get('tor.v3onions') and len(address) == 62:
             continue
         # Don't connect to our own address
-        if address == comm_inst.hsAddress:
+        if address in transports:
             continue
         # Don't connect to invalid address or if its already been tried/connected, or if its cooled down
         if len(address) == 0 or address in tried or address in comm_inst.onlinePeers or address in comm_inst.cooldownPeer:

onionr/communicatorutils/downloadblocks/__init__.py

@@ -78,7 +78,7 @@ def download_blocks_from_communicator(comm_inst):
                     if onionrcrypto.cryptoutils.verify_POW(content): # check if POW is enough/correct
                         logger.info('Attempting to save block %s...' % blockHash[:12])
                         try:
-                            onionrstorage.setdata.set_data(content)
+                            onionrstorage.set_data(content)
                         except onionrexceptions.DataExists:
                             logger.warn('Data is already set for %s ' % (blockHash,))
                         except onionrexceptions.DiskAllocationReached:

onionr/communicatorutils/housekeeping.py

@@ -22,7 +22,7 @@ import logger
 from onionrusers import onionrusers
 from onionrutils import epoch
 from coredb import blockmetadb, dbfiles
-from onionrstorage import removeblock, setdata
+from onionrstorage import removeblock
 def clean_old_blocks(comm_inst):
     '''Delete old blocks if our disk allocation is full/near full, and also expired blocks'''
 

onionr/communicatorutils/lookupadders.py

@@ -21,13 +21,12 @@ import logger
 from onionrutils import stringvalidators
 from communicator import peeraction, onlinepeers
 from utils import gettransports
-transports = gettransports.get()
 def lookup_new_peer_transports_with_communicator(comm_inst):
     logger.info('Looking up new addresses...')
     tryAmount = 1
     newPeers = []
-    if len(transports) == 0:
-        transports = list(gettransports.get())
+    transports = gettransports.get()
+
     for i in range(tryAmount):
         # Download new peer address list from random online peers
         if len(newPeers) > 10000:

onionr/communicatorutils/uploadblocks.py

@@ -45,7 +45,7 @@ def upload_blocks_from_communicator(comm_inst):
                 data = {'block': block.Block(bl).getRaw()}
                 proxyType = proxypicker.pick_proxy(peer)
                 logger.info("Uploading block to " + peer, terminal=True)
-                if not basicrequests.do_post_request(url, data=data, proxyType=proxyType) == False:
+                if not basicrequests.do_post_request(comm_inst.onionrInst, url, data=data, proxyType=proxyType) == False:
                     localcommand.local_command('waitforshare/' + bl, post=True)
                     finishedUploads.append(bl)
     for x in finishedUploads: