Merge branch 'crypto' of https://github.com/beardog108/Onionr into crypto

This commit is contained in:
Arinerron 2018-04-18 19:16:16 -07:00
commit 5dd0437f14

View File

@ -52,7 +52,7 @@ class OnionrCommunicate:
highFailureTimer = 0 highFailureTimer = 0
highFailureRate = 10 highFailureRate = 10
heartBeatTimer = 0 heartBeatTimer = 0
heartBeatRate = 5 heartBeatRate = 0
pexTimer = 25 # How often we should check for new peers pexTimer = 25 # How often we should check for new peers
pexCount = 0 pexCount = 0
logger.debug('Communicator debugging enabled.') logger.debug('Communicator debugging enabled.')
@ -167,7 +167,10 @@ class OnionrCommunicate:
if currentDB != False: if currentDB != False:
if lastDB != currentDB: if lastDB != currentDB:
logger.debug('Fetching hash from ' + i + ' - ' + currentDB + ' current hash.') logger.debug('Fetching hash from ' + i + ' - ' + currentDB + ' current hash.')
blocks += self.performGet('getBlockHashes', i) try:
blocks += self.performGet('getBlockHashes', i)
except TypeError:
logger.warn('Failed to get data hash from ' + i)
if self._utils.validateHash(currentDB): if self._utils.validateHash(currentDB):
self._core.setAddressInfo(i, "DBHash", currentDB) self._core.setAddressInfo(i, "DBHash", currentDB)
if len(blocks.strip()) != 0: if len(blocks.strip()) != 0: