Refactor code
This commit is contained in:
parent
a5dbf73df4
commit
0dc6a0b6c5
|
@ -556,13 +556,11 @@ class Onionr:
|
|||
return
|
||||
|
||||
def get_hostname(self):
|
||||
retVal = ''
|
||||
try:
|
||||
with open('./data/hs/hostname', 'r') as hostname:
|
||||
retVal = hostname.read()
|
||||
except FileNotFoundError:
|
||||
retVal = None
|
||||
return retVal
|
||||
return hostname.read().strip()
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
def addFile(self):
|
||||
'''command to add a file to the onionr network'''
|
||||
|
|
|
@ -17,10 +17,12 @@
|
|||
You should have received a copy of the GNU General Public License
|
||||
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 btc
|
||||
|
||||
class POW:
|
||||
def pow(self, reporting=False):
|
||||
def pow(self, reporting = False):
|
||||
startTime = math.floor(time.time())
|
||||
self.hashing = True
|
||||
self.reporting = reporting
|
||||
|
@ -30,12 +32,12 @@ class POW:
|
|||
hbCount = 0
|
||||
blockCheck = 300000 # How often the hasher should check if the bitcoin block is updated (slows hashing but prevents less wasted work)
|
||||
blockCheckCount = 0
|
||||
block = ''#self.bitcoinNode.getBlockHash(self.bitcoinNode.getLastBlockHeight())
|
||||
block = '' #self.bitcoinNode.getBlockHash(self.bitcoinNode.getLastBlockHeight())
|
||||
while self.hashing:
|
||||
if blockCheckCount == blockCheck:
|
||||
if self.reporting:
|
||||
logger.debug('Refreshing Bitcoin block')
|
||||
block = ''#self.bitcoinNode.getBlockHash(self.bitcoinNode.getLastBlockHeight())
|
||||
block = '' #self.bitcoinNode.getBlockHash(self.bitcoinNode.getLastBlockHeight())
|
||||
blockCheckCount = 0
|
||||
blockCheckCount += 1
|
||||
hbCount += 1
|
||||
|
@ -77,7 +79,9 @@ class POW:
|
|||
self.difficulty = newDiff
|
||||
|
||||
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:
|
||||
retVal = self.result
|
||||
except AttributeError:
|
||||
|
|
|
@ -120,14 +120,11 @@ class OnionrUtils:
|
|||
|
||||
def getMyAddress(self):
|
||||
try:
|
||||
myAddressFile = open("data/hs/hostname", 'r')
|
||||
myAddress = myAddressFile.read()
|
||||
myAddressFile.close()
|
||||
|
||||
return myAddress.strip()
|
||||
with open('./data/hs/hostname', 'r') as hostname:
|
||||
return hostname.read().strip()
|
||||
except Exception as error:
|
||||
logger.error('Failed to read my address.', error=error)
|
||||
return ''
|
||||
return None
|
||||
|
||||
def localCommand(self, command, silent = True):
|
||||
'''
|
||||
|
|
Loading…
Reference in New Issue