LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 09:45:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lnworker: get_channel_by_short_id

Browse source
This commit is contained in:
ThomasV 2019-02-02 22:47:45 +01:00
parent fa96efabb5
commit a975ac1571
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
electrum/lnworker.py
View file

@ -453,26 +453,24 @@ class LNWorker(PrintError):
fut = asyncio.run_coroutine_threadsafe(coro, self.network.asyncio_loop) fut = asyncio.run_coroutine_threadsafe(coro, self.network.asyncio_loop)
return addr, peer, fut return addr, peer, fut
def get_channel_by_short_id(self, short_channel_id):
with self.lock:
for chan in self.channels.values():
if chan.short_channel_id == short_channel_id:
return chan
def _pay(self, invoice, amount_sat=None): def _pay(self, invoice, amount_sat=None):
addr = self._check_invoice(invoice, amount_sat) addr = self._check_invoice(invoice, amount_sat)
route = self._create_route_from_invoice(decoded_invoice=addr) route = self._create_route_from_invoice(decoded_invoice=addr)
peer = self.peers[route[0].node_id] peer = self.peers[route[0].node_id]
for chan in self.channels.values(): if not self.get_channel_by_short_id(route[0].short_channel_id):
if chan.short_channel_id == route[0].short_channel_id:
chan_id = chan.channel_id
break
else:
assert False, 'Found route with short channel ID we don\'t have: ' + repr(route[0].short_channel_id) assert False, 'Found route with short channel ID we don\'t have: ' + repr(route[0].short_channel_id)
return addr, peer, self._pay_to_route(route, addr) return addr, peer, self._pay_to_route(route, addr)
async def _pay_to_route(self, route, addr): async def _pay_to_route(self, route, addr):
short_channel_id = route[0].short_channel_id short_channel_id = route[0].short_channel_id
with self.lock: chan = self.get_channel_by_short_id(short_channel_id)
channels = list(self.channels.values()) if not chan:
for chan in channels:
if chan.short_channel_id == short_channel_id:
break
else:
raise Exception("PathFinder returned path with short_channel_id {} that is not in channel list".format(bh2u(short_channel_id))) raise Exception("PathFinder returned path with short_channel_id {} that is not in channel list".format(bh2u(short_channel_id)))
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(addr.amount * COIN * 1000), addr.paymenthash, addr.get_min_final_cltv_expiry())