wallet.clear_requests. fixes #6279

This commit is contained in:
ThomasV 2020-06-26 09:47:16 +02:00
parent abac4a4340
commit b0c390e231
3 changed files with 7 additions and 5 deletions

View file

@ -877,8 +877,8 @@ class Commands:
@command('w') @command('w')
async def clear_requests(self, wallet: Abstract_Wallet = None): async def clear_requests(self, wallet: Abstract_Wallet = None):
"""Remove all payment requests""" """Remove all payment requests"""
for k in list(wallet.receive_requests.keys()): wallet.clear_requests()
wallet.remove_payment_request(k) return True
@command('w') @command('w')
async def clear_invoices(self, wallet: Abstract_Wallet = None): async def clear_invoices(self, wallet: Abstract_Wallet = None):

View file

@ -535,9 +535,7 @@ class ReceiveScreen(CScreen):
return return
def callback(c): def callback(c):
if c: if c:
for req in requests: self.app.wallet.clear_requests()
key = req.get('rhash') or req['address']
self.app.wallet.delete_request(key)
self.update() self.update()
n = len(requests) n = len(requests)
d = Question(_('Delete {} requests?').format(n), callback) d = Question(_('Delete {} requests?').format(n), callback)

View file

@ -726,6 +726,10 @@ class Abstract_Wallet(AddressSynchronizer, ABC):
self.invoices = {} self.invoices = {}
self.save_db() self.save_db()
def clear_requests(self):
self.receive_requests = {}
self.save_db()
def get_invoices(self): def get_invoices(self):
out = list(self.invoices.values()) out = list(self.invoices.values())
#out = list(filter(None, out)) filter out ln #out = list(filter(None, out)) filter out ln