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

cli: fix add_peer cmd

Browse source
This commit is contained in:
SomberNight 2019-07-23 20:14:59 +02:00 • committed by ThomasV
parent 9045d7b293
commit 4ccfa39fdd
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
electrum/commands.py
View file

@ -776,7 +776,9 @@ class Commands:
# lightning network commands # lightning network commands
@command('wn') @command('wn')
def add_peer(self, connection_string, timeout=20): def add_peer(self, connection_string, timeout=20):
return self.lnworker.add_peer(connection_string) coro = self.lnworker.add_peer(connection_string)
self.network.run_from_another_thread(coro, timeout=timeout)
return True
@command('wpn') @command('wpn')
def open_channel(self, connection_string, amount, channel_push=0, password=None): def open_channel(self, connection_string, amount, channel_push=0, password=None):

2
electrum/lnworker.py
View file

@ -643,7 +643,7 @@ class LNWallet(LNWorker):
def on_channels_updated(self): def on_channels_updated(self):
self.network.trigger_callback('channels') self.network.trigger_callback('channels')
async def add_peer(self, connect_str, timeout=20): async def add_peer(self, connect_str: str) -> Peer:
node_id, rest = extract_nodeid(connect_str) node_id, rest = extract_nodeid(connect_str)
peer = self.peers.get(node_id) peer = self.peers.get(node_id)
if not peer: if not peer:

4
electrum/network.py
View file

@ -311,10 +311,10 @@ class Network(Logger):
self.lnwatcher = None self.lnwatcher = None
self.lngossip = None self.lngossip = None
def run_from_another_thread(self, coro): def run_from_another_thread(self, coro, *, timeout=None):
assert self._loop_thread != threading.current_thread(), 'must not be called from network thread' assert self._loop_thread != threading.current_thread(), 'must not be called from network thread'
fut = asyncio.run_coroutine_threadsafe(coro, self.asyncio_loop) fut = asyncio.run_coroutine_threadsafe(coro, self.asyncio_loop)
return fut.result() return fut.result(timeout)
@staticmethod @staticmethod
def get_instance() -> Optional["Network"]: def get_instance() -> Optional["Network"]: