kev/Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

Refactor code

Browse Source
This commit is contained in:
Arinerron 2018-04-22 20:49:53 -07:00
parent a5dbf73df4
commit 0dc6a0b6c5
No known key found for this signature in database
GPG Key ID: 99383627861C62F0
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
onionr/onionr.py
View File

@ -556,13 +556,11 @@ class Onionr:
return return
def get_hostname(self): def get_hostname(self):
retVal = ''
try: try:
with open('./data/hs/hostname', 'r') as hostname: with open('./data/hs/hostname', 'r') as hostname:
retVal = hostname.read() return hostname.read().strip()
except FileNotFoundError: except Exception:
retVal = None return None
return retVal
def addFile(self): def addFile(self):
'''command to add a file to the onionr network''' '''command to add a file to the onionr network'''

12
onionr/onionrproofs.py
View File

@ -17,10 +17,12 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
''' '''
import nacl.encoding, nacl.hash, nacl.utils, time, math, threading, binascii, logger import nacl.encoding, nacl.hash, nacl.utils, time, math, threading, binascii, logger
import btc import btc
class POW: class POW:
def pow(self, reporting=False): def pow(self, reporting = False):
startTime = math.floor(time.time()) startTime = math.floor(time.time())
self.hashing = True self.hashing = True
self.reporting = reporting self.reporting = reporting
@ -30,12 +32,12 @@ class POW:
hbCount = 0 hbCount = 0
blockCheck = 300000 # How often the hasher should check if the bitcoin block is updated (slows hashing but prevents less wasted work) blockCheck = 300000 # How often the hasher should check if the bitcoin block is updated (slows hashing but prevents less wasted work)
blockCheckCount = 0 blockCheckCount = 0
block = ''#self.bitcoinNode.getBlockHash(self.bitcoinNode.getLastBlockHeight()) block = '' #self.bitcoinNode.getBlockHash(self.bitcoinNode.getLastBlockHeight())
while self.hashing: while self.hashing:
if blockCheckCount == blockCheck: if blockCheckCount == blockCheck:
if self.reporting: if self.reporting:
logger.debug('Refreshing Bitcoin block') logger.debug('Refreshing Bitcoin block')
block = ''#self.bitcoinNode.getBlockHash(self.bitcoinNode.getLastBlockHeight()) block = '' #self.bitcoinNode.getBlockHash(self.bitcoinNode.getLastBlockHeight())
blockCheckCount = 0 blockCheckCount = 0
blockCheckCount += 1 blockCheckCount += 1
hbCount += 1 hbCount += 1
@ -77,7 +79,9 @@ class POW:
self.difficulty = newDiff self.difficulty = newDiff
def getResult(self): def getResult(self):
'''Returns the result then sets to false, useful to automatically clear the result''' '''
Returns the result then sets to false, useful to automatically clear the result
'''
try: try:
retVal = self.result retVal = self.result
except AttributeError: except AttributeError:

9
onionr/onionrutils.py
View File

@ -120,14 +120,11 @@ class OnionrUtils:
def getMyAddress(self): def getMyAddress(self):
try: try:
myAddressFile = open("data/hs/hostname", 'r') with open('./data/hs/hostname', 'r') as hostname:
myAddress = myAddressFile.read() return hostname.read().strip()
myAddressFile.close()
return myAddress.strip()
except Exception as error: except Exception as error:
logger.error('Failed to read my address.', error=error) logger.error('Failed to read my address.', error=error)
return '' return None
def localCommand(self, command, silent = True): def localCommand(self, command, silent = True):
''' '''