citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #461 from Atheros1/master

Browse Source 
Use fast POW unless frozen
This commit is contained in:
Jonathan Warren 2013-08-30 08:56:57 -07:00
commit ae03a2c621
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/proofofwork.py
View File

@ -4,7 +4,7 @@
import hashlib import hashlib
from struct import unpack, pack from struct import unpack, pack
import sys import sys
from shared import config from shared import config, frozen
#import os #import os
def _set_idle(): def _set_idle():
@ -71,7 +71,7 @@ def _doFastPoW(target, initialHash):
time.sleep(0.2) time.sleep(0.2)
def run(target, initialHash): def run(target, initialHash):
if 'linux' in sys.platform: if frozen == "macosx_app" or not frozen:
return _doFastPoW(target, initialHash) return _doFastPoW(target, initialHash)
else: else:
return _doSafePoW(target, initialHash) return _doSafePoW(target, initialHash)

5
src/shared.py
View File

@ -79,6 +79,11 @@ networkDefaultPayloadLengthExtraBytes = 14000 #To make sending short messages a
# namecoin integration to "namecoind". # namecoin integration to "namecoind".
namecoinDefaultRpcPort = "8336" namecoinDefaultRpcPort = "8336"
# When using py2exe or py2app, the variable frozen is added to the sys
# namespace. This can be used to setup a different code path for
# binary distributions vs source distributions.
frozen = getattr(sys,'frozen', None)
def isInSqlInventory(hash): def isInSqlInventory(hash):
t = (hash,) t = (hash,)
shared.sqlLock.acquire() shared.sqlLock.acquire()