tremove redundant test from lnworker._pay, rename pay_to_route parameter to lnaddr - electrum - Electrum Bitcoin wallet
 (HTM) git clone https://git.parazyd.org/electrum
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Submodules
       ---
 (DIR) commit bcb10e6e5377b06fd94e5447dae3cd2debb21ddf
 (DIR) parent 7c283f9cd21e372b9a324f370b5376fdfe1a628b
 (HTM) Author: ThomasV <thomasv@electrum.org>
       Date:   Fri,  4 Oct 2019 18:06:53 +0200
       
       remove redundant test from lnworker._pay, rename pay_to_route parameter to lnaddr
       
       Diffstat:
         M electrum/lnworker.py                |      15 ++++++---------
         M electrum/tests/test_lnpeer.py       |       2 +-
       
       2 files changed, 7 insertions(+), 10 deletions(-)
       ---
 (DIR) diff --git a/electrum/lnworker.py b/electrum/lnworker.py
       t@@ -859,26 +859,23 @@ class LNWallet(LNWorker):
                self.wallet.set_label(key, lnaddr.get_description())
                for i in range(attempts):
                    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)
       -            if await self._pay_to_route(route, lnaddr, invoice):
       +            if await self._pay_to_route(route, lnaddr):
                        return True
                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
                chan = self.get_channel_by_short_id(short_channel_id)
                if not chan:
                    raise Exception(f"PathFinder returned path with short_channel_id "
                                    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]
       -        htlc = await peer.pay(route, chan, int(addr.amount * COIN * 1000), addr.paymenthash, addr.get_min_final_cltv_expiry())
       -        self.network.trigger_callback('htlc_added', htlc, addr, SENT)
       +        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, lnaddr, SENT)
                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
        
            @staticmethod
 (DIR) diff --git a/electrum/tests/test_lnpeer.py b/electrum/tests/test_lnpeer.py
       t@@ -259,7 +259,7 @@ class TestPeer(ElectrumTestCase):
                # AssertionError is ok since we shouldn't use old routes, and the
                # route finding should fail when channel is closed
                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):
                    run(f())