trename paying -> inflight - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 0a08ccc1c6ff910661059a47fa79b1462a927512
DIR parent b0d60007719ede7d4bc213a9393667e9b9328161
HTML Author: ThomasV <thomasv@electrum.org>
Date: Mon, 28 Jan 2019 11:53:21 +0100
rename paying -> inflight
Diffstat:
M electrum/lnworker.py | 14 +++++++-------
M electrum/tests/test_lnbase.py | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
---
DIR diff --git a/electrum/lnworker.py b/electrum/lnworker.py
t@@ -68,7 +68,7 @@ class LNWorker(PrintError):
self.wallet = wallet
# invoices we are currently trying to pay (might be pending HTLCs on a commitment transaction)
self.invoices = self.wallet.storage.get('lightning_invoices', {}) # type: Dict[str, Tuple[str,str]] # RHASH -> (preimage, invoice)
- self.paying = self.wallet.storage.get('lightning_payments_inflight', {}) # type: Dict[bytes, Tuple[str, Optional[int], str]]
+ self.inflight = self.wallet.storage.get('lightning_payments_inflight', {}) # type: Dict[bytes, Tuple[str, Optional[int], str]]
self.completed = self.wallet.storage.get('lightning_payments_completed', {})
self.sweep_address = wallet.get_receiving_address()
self.lock = threading.RLock()
t@@ -128,8 +128,8 @@ class LNWorker(PrintError):
chan_id = chan.channel_id
if direction == SENT:
assert htlc.payment_hash not in self.invoices
- self.paying.pop(key)
- self.wallet.storage.put('lightning_payments_inflight', self.paying)
+ self.inflight.pop(key)
+ self.wallet.storage.put('lightning_payments_inflight', self.inflight)
if not preimage:
preimage, _addr = self.get_invoice(htlc.payment_hash)
tupl = (time.time(), direction, json.loads(encoder.encode(htlc)), bh2u(preimage), bh2u(chan_id))
t@@ -142,7 +142,7 @@ class LNWorker(PrintError):
from electrum.util import PR_UNPAID, PR_EXPIRED, PR_PAID, PR_UNKNOWN, PR_INFLIGHT
if key in self.completed:
return PR_PAID
- elif key in self.paying:
+ elif key in self.inflight:
return PR_INFLIGHT
elif key in self.invoices:
return PR_UNPAID
t@@ -169,7 +169,7 @@ class LNWorker(PrintError):
for preimage, pay_req in invoices.values():
addr = lndecode(pay_req, expected_hrp=constants.net.SEGWIT_HRP)
unsettled.append((addr, bfh(preimage), pay_req))
- for pay_req, amount_sat, this_chan_id in self.paying.values():
+ for pay_req, amount_sat, this_chan_id in self.inflight.values():
if chan_id is not None and bfh(this_chan_id) != chan_id:
continue
addr = lndecode(pay_req, expected_hrp=constants.net.SEGWIT_HRP)
t@@ -447,8 +447,8 @@ class LNWorker(PrintError):
break
else:
assert False, 'Found route with short channel ID we don\'t have: ' + repr(route[0].short_channel_id)
- self.paying[bh2u(addr.paymenthash)] = (invoice, amount_sat, bh2u(chan_id))
- self.wallet.storage.put('lightning_payments_inflight', self.paying)
+ self.inflight[bh2u(addr.paymenthash)] = (invoice, amount_sat, bh2u(chan_id))
+ self.wallet.storage.put('lightning_payments_inflight', self.inflight)
self.wallet.storage.write()
return addr, peer, self._pay_to_route(route, addr)
DIR diff --git a/electrum/tests/test_lnbase.py b/electrum/tests/test_lnbase.py
t@@ -82,7 +82,7 @@ class MockLNWorker:
self.network = MockNetwork(tx_queue)
self.channels = {self.chan.channel_id: self.chan}
self.invoices = {}
- self.paying = {}
+ self.inflight = {}
self.wallet = MockWallet()
@property