LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove redundant test from lnworker._pay, rename pay_to_route parameter to lnaddr

Browse source
This commit is contained in:
ThomasV 2019-10-04 18:06:53 +02:00
parent 7c283f9cd2
commit bcb10e6e53
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
electrum/lnworker.py
View file

@ -859,26 +859,23 @@ class LNWallet(LNWorker):
self.wallet.set_label(key, lnaddr.get_description()) self.wallet.set_label(key, lnaddr.get_description())
for i in range(attempts): for i in range(attempts):
route = await self._create_route_from_invoice(decoded_invoice=lnaddr) route = await self._create_route_from_invoice(decoded_invoice=lnaddr)
if not self.get_channel_by_short_id(route[0].short_channel_id):
scid = route[0].short_channel_id
raise Exception(f"Got route with unknown first channel: {scid}")
self.network.trigger_callback('payment_status', key, 'progress', i) self.network.trigger_callback('payment_status', key, 'progress', i)
if await self._pay_to_route(route, lnaddr, invoice): if await self._pay_to_route(route, lnaddr):
return True return True
return False return False
async def _pay_to_route(self, route, addr, invoice): async def _pay_to_route(self, route, lnaddr):
short_channel_id = route[0].short_channel_id short_channel_id = route[0].short_channel_id
chan = self.get_channel_by_short_id(short_channel_id) chan = self.get_channel_by_short_id(short_channel_id)
if not chan: if not chan:
raise Exception(f"PathFinder returned path with short_channel_id " raise Exception(f"PathFinder returned path with short_channel_id "
f"{short_channel_id} that is not in channel list") f"{short_channel_id} that is not in channel list")
self.set_invoice_status(addr.paymenthash, PR_INFLIGHT) self.set_invoice_status(lnaddr.paymenthash, PR_INFLIGHT)
peer = self.peers[route[0].node_id] peer = self.peers[route[0].node_id]
htlc = await peer.pay(route, chan, int(addr.amount * COIN * 1000), addr.paymenthash, addr.get_min_final_cltv_expiry()) htlc = await peer.pay(route, chan, int(lnaddr.amount * COIN * 1000), lnaddr.paymenthash, lnaddr.get_min_final_cltv_expiry())
self.network.trigger_callback('htlc_added', htlc, addr, SENT) self.network.trigger_callback('htlc_added', htlc, lnaddr, SENT)
success = await self.pending_payments[(short_channel_id, htlc.htlc_id)] success = await self.pending_payments[(short_channel_id, htlc.htlc_id)]
self.set_invoice_status(addr.paymenthash, (PR_PAID if success else PR_UNPAID)) self.set_invoice_status(lnaddr.paymenthash, (PR_PAID if success else PR_UNPAID))
return success return success
@staticmethod @staticmethod

2
electrum/tests/test_lnpeer.py
View file

@ -259,7 +259,7 @@ class TestPeer(ElectrumTestCase):
# AssertionError is ok since we shouldn't use old routes, and the # AssertionError is ok since we shouldn't use old routes, and the
# route finding should fail when channel is closed # route finding should fail when channel is closed
async def f(): async def f():
await asyncio.gather(w1._pay_to_route(route, addr, pay_req), p1._message_loop(), p2._message_loop()) await asyncio.gather(w1._pay_to_route(route, addr), p1._message_loop(), p2._message_loop())
with self.assertRaises(PaymentFailure): with self.assertRaises(PaymentFailure):
run(f()) run(f())