work on onboarding and pep8 compliance. re-worded about
This commit is contained in:
		
							parent
							
								
									a4a0d240ac
								
							
						
					
					
						commit
						ee5f4409af
					
				
					 16 changed files with 267 additions and 60 deletions
				
			
		|  | @ -3,6 +3,20 @@ | |||
| 
 | ||||
|     Download blocks using the communicator instance | ||||
| ''' | ||||
| import onionrexceptions | ||||
| import logger | ||||
| import onionrpeers | ||||
| import communicator | ||||
| from communicator import peeraction | ||||
| from communicator import onlinepeers | ||||
| from onionrutils import blockmetadata | ||||
| from onionrutils import validatemetadata | ||||
| from coredb import blockmetadb | ||||
| import onionrcrypto | ||||
| import onionrstorage | ||||
| from onionrblocks import onionrblacklist | ||||
| from onionrblocks import storagecounter | ||||
| from . import shoulddownload | ||||
| ''' | ||||
|     This program is free software: you can redistribute it and/or modify | ||||
|     it under the terms of the GNU General Public License as published by | ||||
|  | @ -17,17 +31,10 @@ | |||
|     You should have received a copy of the GNU General Public License | ||||
|     along with this program.  If not, see <https://www.gnu.org/licenses/>. | ||||
| ''' | ||||
| import communicator, onionrexceptions | ||||
| import logger, onionrpeers | ||||
| from onionrutils import blockmetadata, stringvalidators, validatemetadata | ||||
| from coredb import blockmetadb | ||||
| from . import shoulddownload | ||||
| from communicator import peeraction, onlinepeers | ||||
| import onionrcrypto, onionrstorage | ||||
| from onionrblocks import onionrblacklist, storagecounter | ||||
| def download_blocks_from_communicator(comm_inst): | ||||
|     '''Use Onionr communicator instance to download blocks in the communicator's queue''' | ||||
|     assert isinstance(comm_inst, communicator.OnionrCommunicatorDaemon) | ||||
| 
 | ||||
| 
 | ||||
| def download_blocks_from_communicator(comm_inst: "OnionrCommunicatorDaemon"): | ||||
|     '''Use communicator instance to download blocks in the comms's queue''' | ||||
|     blacklist = onionrblacklist.OnionrBlackList() | ||||
|     storage_counter = storagecounter.StorageCounter() | ||||
|     LOG_SKIP_COUNT = 50 # for how many iterations we skip logging the counter | ||||
|  | @ -53,7 +60,6 @@ def download_blocks_from_communicator(comm_inst): | |||
|             break | ||||
|         # Do not download blocks being downloaded | ||||
|         if blockHash in comm_inst.currentDownloading: | ||||
|             #logger.debug('Already downloading block %s...' % blockHash) | ||||
|             continue | ||||
| 
 | ||||
|         comm_inst.currentDownloading.append(blockHash) # So we can avoid concurrent downloading in other threads of same block | ||||
|  | @ -130,4 +136,4 @@ def download_blocks_from_communicator(comm_inst): | |||
|                 except KeyError: | ||||
|                     pass | ||||
|         comm_inst.currentDownloading.remove(blockHash) | ||||
|     comm_inst.decrementThreadCount('getBlocks') | ||||
|     comm_inst.decrementThreadCount('getBlocks') | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue