Bitmessage/PyBitmessage-2024-11-28
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Add exception type in HandleSendMessage and HandleSendBroadcast

Browse Source 
and API error 14 in HandleSendBroadcast.
This commit is contained in:
Dmitri Bogomolov 2021-11-29 17:30:39 +02:00 committed by Lee Miller
parent f311d9d25c
commit e12e9c4155
Signed by untrusted user: lee.miller
GPG Key ID: 4F97A5EA88F4AB63
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api.py
View File

@ -1118,9 +1118,8 @@ class BMRPCDispatcher(object):
fromAddress = addBMIfNotPresent(fromAddress) fromAddress = addBMIfNotPresent(fromAddress)
self._verifyAddress(fromAddress) self._verifyAddress(fromAddress)
try: try:
fromAddressEnabled = self.config.getboolean( fromAddressEnabled = self.config.getboolean(fromAddress, 'enabled')
fromAddress, 'enabled') except ConfigParser.NoSectionError:
except BaseException:
raise APIError( raise APIError(
13, 'Could not find your fromAddress in the keys.dat file.') 13, 'Could not find your fromAddress in the keys.dat file.')
if not fromAddressEnabled: if not fromAddressEnabled:
@ -1164,10 +1163,13 @@ class BMRPCDispatcher(object):
fromAddress = addBMIfNotPresent(fromAddress) fromAddress = addBMIfNotPresent(fromAddress)
self._verifyAddress(fromAddress) self._verifyAddress(fromAddress)
try: try:
self.config.getboolean(fromAddress, 'enabled') fromAddressEnabled = self.config.getboolean(fromAddress, 'enabled')
except BaseException: except ConfigParser.NoSectionError:
raise APIError( raise APIError(
13, 'Could not find your fromAddress in the keys.dat file.') 13, 'Could not find your fromAddress in the keys.dat file.')
if not fromAddressEnabled:
raise APIError(14, 'Your fromAddress is disabled. Cannot send.')
toAddress = str_broadcast_subscribers toAddress = str_broadcast_subscribers
ackdata = helper_sent.insert( ackdata = helper_sent.insert(