Bitmessage/PyBitmessage-2025-01-18
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Converted some more print statements.

Browse Source
This commit is contained in:
Carlos Killpack 2013-06-22 17:04:03 -06:00
parent 9fb8fda02d
commit 7af8318ab4
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/addresses.py
View File

@ -1,7 +1,7 @@
import hashlib import hashlib
from struct import * from struct import *
from pyelliptic import arithmetic from pyelliptic import arithmetic
from debug import logger
#There is another copy of this function in Bitmessagemain.py #There is another copy of this function in Bitmessagemain.py
@ -28,7 +28,7 @@ def encodeBase58(num, alphabet=ALPHABET):
base = len(alphabet) base = len(alphabet)
while num: while num:
rem = num % base rem = num % base
#print 'num is:', num #logger.info('num is: %d' % num)
num = num // base num = num // base
arr.append(alphabet[rem]) arr.append(alphabet[rem])
arr.reverse() arr.reverse()
@ -68,7 +68,7 @@ def encodeVarint(integer):
if integer >= 4294967296 and integer < 18446744073709551616: if integer >= 4294967296 and integer < 18446744073709551616:
return pack('>B',255) + pack('>Q',integer) return pack('>B',255) + pack('>Q',integer)
if integer >= 18446744073709551616: if integer >= 18446744073709551616:
print 'varint cannot be >= 18446744073709551616' logger.debug('varint cannot be >= 18446744073709551616')
raise SystemExit raise SystemExit
def decodeVarint(data): def decodeVarint(data):
@ -108,15 +108,15 @@ def encodeAddress(version,stream,ripe):
sha = hashlib.new('sha512') sha = hashlib.new('sha512')
sha.update(a) sha.update(a)
currentHash = sha.digest() currentHash = sha.digest()
#print 'sha after first hashing: ', sha.hexdigest() #logger.info('sha after first hashing: %d' % sha.hexdigest())
sha = hashlib.new('sha512') sha = hashlib.new('sha512')
sha.update(currentHash) sha.update(currentHash)
#print 'sha after second hashing: ', sha.hexdigest() #logger.info('sha after second hashing: %d' % sha.hexdigest())
checksum = sha.digest()[0:4] checksum = sha.digest()[0:4]
#print 'len(a) = ', len(a) #logger.info('len(a) = %d' % len(a))
#print 'checksum = ', checksum.encode('hex') #logger.info('checksum = %d' % checksum.encode('hex'))
#print 'len(checksum) = ', len(checksum) #logger.info('len(checksum) = %d' % len(checksum))
asInt = int(a.encode('hex') + checksum.encode('hex'),16) asInt = int(a.encode('hex') + checksum.encode('hex'),16)
#asInt = int(checksum.encode('hex') + a.encode('hex'),16) #asInt = int(checksum.encode('hex') + a.encode('hex'),16)
@ -141,7 +141,7 @@ def decodeAddress(address):
if len(hexdata) % 2 != 0: if len(hexdata) % 2 != 0:
hexdata = '0' + hexdata hexdata = '0' + hexdata
#print 'hexdata', hexdata #logger.info('hexdata %d' % hexdata)
data = hexdata.decode('hex') data = hexdata.decode('hex')
checksum = data[-4:] checksum = data[-4:]
@ -149,10 +149,10 @@ def decodeAddress(address):
sha = hashlib.new('sha512') sha = hashlib.new('sha512')
sha.update(data[:-4]) sha.update(data[:-4])
currentHash = sha.digest() currentHash = sha.digest()
#print 'sha after first hashing: ', sha.hexdigest() #logger.info('sha after first hashing: %d' % sha.hexdigest())
sha = hashlib.new('sha512') sha = hashlib.new('sha512')
sha.update(currentHash) sha.update(currentHash)
#print 'sha after second hashing: ', sha.hexdigest() #logger.info('sha after second hashing: %d' % sha.hexdigest())
if checksum != sha.digest()[0:4]: if checksum != sha.digest()[0:4]:
status = 'checksumfailed' status = 'checksumfailed'
@ -165,11 +165,11 @@ def decodeAddress(address):
#print 'bytesUsedByVersionNumber', bytesUsedByVersionNumber #print 'bytesUsedByVersionNumber', bytesUsedByVersionNumber
if addressVersionNumber > 3: if addressVersionNumber > 3:
print 'cannot decode address version numbers this high' logger.info('Cannot decode address version numbers this high.')
status = 'versiontoohigh' status = 'versiontoohigh'
return status,0,0,0 return status,0,0,0
elif addressVersionNumber == 0: elif addressVersionNumber == 0:
print 'cannot decode address version numbers of zero.' logger.info('Cannot decode address version numbers of zero.')
status = 'versiontoohigh' status = 'versiontoohigh'
return status,0,0,0 return status,0,0,0
@ -228,7 +228,7 @@ def addressStream(address):
#print 'sha after second hashing: ', sha.hexdigest() #print 'sha after second hashing: ', sha.hexdigest()
if checksum != sha.digest()[0:4]: if checksum != sha.digest()[0:4]:
print 'checksum failed' logger.info('Checksum failed.')
status = 'checksumfailed' status = 'checksumfailed'
return False return False
#else: #else:
@ -239,7 +239,7 @@ def addressStream(address):
#print 'bytesUsedByVersionNumber', bytesUsedByVersionNumber #print 'bytesUsedByVersionNumber', bytesUsedByVersionNumber
if addressVersionNumber < 1: if addressVersionNumber < 1:
print 'cannot decode version address version numbers this high' logger.info('Cannot decode version address version numbers this high')
status = 'versiontoohigh' status = 'versiontoohigh'
return False return False