aljaz/plugins
1
0
Fork 0
mirror of https://github.com/aljazceru/plugins.git synced 2025-12-21 23:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

helpme: fix cli upstream changes on listpeerchannels

Browse Source
This commit is contained in:
Michael Schmoock
2023-02-01 10:46:03 +01:00
parent 1b8d5dde57
commit f7bf735c62
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
helpme/helpme.py
View File

@@ -416,7 +416,12 @@ known_nodes_testnet = {
def get_channel_list(peers, state='CHANNELD_NORMAL'): def get_channel_list(peers, state='CHANNELD_NORMAL'):
channels = [] channels = []
for p in peers: for p in peers:
channels += p['channels'] if 'channels' in p:
channels += p['channels']
elif 'num_channels' in p and p['num_channels'] > 0:
channels += plugin.rpc.listpeerchannels(p['id'])['channels']
else:
raise RpcError("helpme", {}, "RPC does not return channels")
return [c for c in channels if state is None or c['state'] == state] return [c for c in channels if state is None or c['state'] == state]
@@ -976,6 +981,14 @@ class ConnectThread(threading.Thread):
@plugin.init() @plugin.init()
def init(options, configuration, plugin): def init(options, configuration, plugin):
rpchelp = plugin.rpc.help().get('help')
# detect if server cli has moved `listpeers.channels[]` to `listpeerchannels`
# See https://github.com/ElementsProject/lightning/pull/5825
# TODO: replace by rpc version check once v23 is released
plugin.listpeerchannels = False
if len([c for c in rpchelp if c["command"].startswith("listpeerchannels ")]) != 0:
plugin.listpeerchannels = True
network = plugin.rpc.getinfo()['network'] network = plugin.rpc.getinfo()['network']
if network == 'regtest': if network == 'regtest':
plugin.log('Not seeking regtest peers', level='debug') plugin.log('Not seeking regtest peers', level='debug')