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

Some Improvements of Main Object

Browse Source
This commit is contained in:
merlink 2013-08-08 20:11:23 +02:00
parent 4120f1029c
commit 87f22008e3
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/bitmessagemain.py
View File

@ -933,10 +933,7 @@ class Main:
'createRandomAddress', 3, streamNumberForAddress, label, 1, "", eighteenByteRipe, nonceTrialsPerByte, payloadLengthExtraBytes)) 'createRandomAddress', 3, streamNumberForAddress, label, 1, "", eighteenByteRipe, nonceTrialsPerByte, payloadLengthExtraBytes))
return shared.apiAddressGeneratorReturnQueue.get() return shared.apiAddressGeneratorReturnQueue.get()
def createDeterministicAddresses(self,passphrase,numberOfAddresses=1,addressVersionNumber=3,streamNumber=1,eighteenByteRipe=False,totalDifficulty=1,smallMessageDifficulty=1): def createDeterministicAddresses(self,passphrase,numberOfAddresses=1,addressVersionNumber=0,streamNumber=0,eighteenByteRipe=False,totalDifficulty=1,smallMessageDifficulty=1):
addressVersionNumber = 3
streamNumber = 1
nonceTrialsPerByte = int(shared.networkDefaultProofOfWorkNonceTrialsPerByte * totalDifficulty) nonceTrialsPerByte = int(shared.networkDefaultProofOfWorkNonceTrialsPerByte * totalDifficulty)
payloadLengthExtraBytes = int(shared.networkDefaultPayloadLengthExtraBytes * smallMessageDifficulty) payloadLengthExtraBytes = int(shared.networkDefaultPayloadLengthExtraBytes * smallMessageDifficulty)
@ -952,9 +949,10 @@ class Main:
return queueReturn return queueReturn
def getDeterministicAddress(self,passphrase, addressVersionNumber=3, streamNumber=1): def getDeterministicAddress(self,passphrase, addressVersionNumber=3, streamNumber=1):
assert addressVersionNumber == 3, 'Only 3 is supported'
assert streamNumber == 1, 'only 1 is supported'
numberOfAddresses = 1 numberOfAddresses = 1
addressVersionNumber = 3
streamNumber = 1
eighteenByteRipe = False eighteenByteRipe = False
shared.addressGeneratorQueue.put( shared.addressGeneratorQueue.put(
('getDeterministicAddress', addressVersionNumber, ('getDeterministicAddress', addressVersionNumber,
@ -962,8 +960,8 @@ class Main:
return shared.apiAddressGeneratorReturnQueue.get() return shared.apiAddressGeneratorReturnQueue.get()
def sendMessage(self, toAddress, fromAddress, subject, message): def sendMessage(self, toAddress, fromAddress, subject, message, encodingType=2):
encodingType = 2 assert encodingType == 2, 'other values not supported jet'
status, addressVersionNumber, streamNumber, toRipe = decodeAddress(toAddress) status, addressVersionNumber, streamNumber, toRipe = decodeAddress(toAddress)
if status != 'success': if status != 'success':
@ -1134,6 +1132,7 @@ class Main:
shared.sqlLock.release() shared.sqlLock.release()
def sendBroadcast(self,fromAddress,subject,message,encodingType=2): def sendBroadcast(self,fromAddress,subject,message,encodingType=2):
assert encodingType == 2, 'Only 2 is supported jet'
status, addressVersionNumber, streamNumber, toRipe = decodeAddress(fromAddress) status, addressVersionNumber, streamNumber, toRipe = decodeAddress(fromAddress)
fromAddress = addBMIfNotPresent(fromAddress) fromAddress = addBMIfNotPresent(fromAddress)
@ -1235,12 +1234,8 @@ class Main:
if __name__ == "__main__": if __name__ == "__main__":
mainprogram = Main() mainprogram = Main()
mainprogram.start(True) mainprogram.start()
print 'x'*1000
print mainprogram.clientStatus()
print 'y'*1000
mainprogram.stop()
# So far, the creation of and management of the Bitmessage protocol and this # So far, the creation of and management of the Bitmessage protocol and this