AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet.get_request_by_addr: make deterministic

Browse Source 
This makes test_invoices/test_wallet_get_request_by_addr pass without flakyness.

closes https://github.com/spesmilo/electrum/issues/8113
This commit is contained in:
SomberNight
2023-01-12 18:12:05 +00:00
parent 7dcaa4b204
commit 9a0fff2571
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/wallet.py
View File

@@ -2355,8 +2355,13 @@ class Abstract_Wallet(ABC, Logger, EventListener):
if not req.is_lightning() or self.lnworker.get_invoice_status(req) == PR_UNPAID]
if not reqs:
return None
# note: there typically should not be more than one relevant request for an address
return reqs[0]
# note: There typically should not be more than one relevant request for an address.
# If there's multiple, return the one created last (see #8113). Consider:
# - there is an old expired req1, and a newer unpaid req2, reusing the same addr (and same amount),
# - now req2 gets paid. however, get_invoice_status will say both req1 and req2 are PAID. (see #8061)
# - as a workaround, we return the request with the larger creation time.
reqs.sort(key=lambda req: req.get_time())
return reqs[-1]
def get_request(self, request_id: str) -> Optional[Invoice]:
return self._receive_requests.get(request_id)