dxs
/
onionr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

master
Arinerron 2018-04-18 19:25:26 -07:00
parent 620f176826 d8d29b7c28
commit a056c7a7f4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
onionr/communicator.py
View File

@ -181,7 +181,7 @@ class OnionrCommunicate:
continue continue
if self._utils.hasBlock(i): if self._utils.hasBlock(i):
continue continue
logger.debug('Exchanged block (blockList): ' + i) #logger.debug('Exchanged block (blockList): ' + i)
if not self._utils.validateHash(i): if not self._utils.validateHash(i):
# skip hash if it isn't valid # skip hash if it isn't valid
logger.warn('Hash ' + i + ' is not valid') logger.warn('Hash ' + i + ' is not valid')
@ -230,7 +230,7 @@ class OnionrCommunicate:
if len(data) < 120: if len(data) < 120:
logger.debug('Block text:\n' + data) logger.debug('Block text:\n' + data)
else: else:
logger.warn("Failed to validate " + hash) logger.warn("Failed to validate " + hash + " " + " hash calculated was " + digest)
return return

1
onionr/onionrutils.py
View File

@ -110,7 +110,6 @@ class OnionrUtils:
if not adder in self._core.listAdders(randomOrder=False) and adder.strip() != self.getMyAddress(): if not adder in self._core.listAdders(randomOrder=False) and adder.strip() != self.getMyAddress():
if self._core.addAddress(adder): if self._core.addAddress(adder):
logger.info('Added ' + adder + ' to db.', timestamp=True) logger.info('Added ' + adder + ' to db.', timestamp=True)
input()
retVal = True retVal = True
else: else:
logger.debug(adder + " is either our address or already in our DB") logger.debug(adder + " is either our address or already in our DB")