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

tests: remove EXPERIMENTAL_FEATURE flag from openchannel2 hooks

Browse Source 
These are now included in all builds
This commit is contained in:
niftynei
2021-04-20 15:44:45 -05:00
committed by Rusty Russell
parent 15e83925e8
commit 0e753224ae
4 changed files with 20 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/plugins/openchannel_hook_accept.py
View File

@@ -5,14 +5,10 @@ Will simply accept any channel. Useful fot testing chained hook.
""" """
from pyln.client import Plugin from pyln.client import Plugin
from pyln.testing.utils import env
plugin = Plugin() plugin = Plugin()
EXPERIMENTAL_FEATURES = env("EXPERIMENTAL_FEATURES", "0") == "1"
@plugin.hook('openchannel') @plugin.hook('openchannel')
def on_openchannel(openchannel, plugin, **kwargs): def on_openchannel(openchannel, plugin, **kwargs):
msg = "accept on principle" msg = "accept on principle"
@@ -20,12 +16,11 @@ def on_openchannel(openchannel, plugin, **kwargs):
return {'result': 'continue'} return {'result': 'continue'}
if EXPERIMENTAL_FEATURES: @plugin.hook('openchannel2')
@plugin.hook('openchannel2') def on_openchannel2(openchannel2, plugin, **kwargs):
def on_openchannel2(openchannel2, plugin, **kwargs): msg = "accept on principle"
msg = "accept on principle" plugin.log(msg)
plugin.log(msg) return {'result': 'continue'}
return {'result': 'continue'}
plugin.run() plugin.run()

13
tests/plugins/openchannel_hook_accepter.py
View File

@@ -12,14 +12,10 @@
""" """
from pyln.client import Plugin, Millisatoshi from pyln.client import Plugin, Millisatoshi
from pyln.testing.utils import env
plugin = Plugin() plugin = Plugin()
EXPERIMENTAL_FEATURES = env("EXPERIMENTAL_FEATURES", "0") == "1"
def run_openchannel(funding_sats_str, plugin): def run_openchannel(funding_sats_str, plugin):
# Convert from string to satoshis # Convert from string to satoshis
funding_sats = Millisatoshi(funding_sats_str).to_satoshi() funding_sats = Millisatoshi(funding_sats_str).to_satoshi()
@@ -59,11 +55,10 @@ def on_openchannel(openchannel, plugin, **kwargs):
return run_openchannel(openchannel['funding_satoshis'], plugin) return run_openchannel(openchannel['funding_satoshis'], plugin)
if EXPERIMENTAL_FEATURES: @plugin.hook('openchannel2')
@plugin.hook('openchannel2') def on_openchannel2(openchannel2, plugin, **kwargs):
def on_openchannel2(openchannel2, plugin, **kwargs): """ Support for v2 channel opens """
""" Support for v2 channel opens """ return run_openchannel(openchannel2['their_funding'], plugin)
return run_openchannel(openchannel2['their_funding'], plugin)
plugin.run() plugin.run()

15
tests/plugins/openchannel_hook_reject.py
View File

@@ -6,10 +6,6 @@ Useful fot testing chained hook.
""" """
from pyln.client import Plugin from pyln.client import Plugin
from pyln.testing.utils import env
EXPERIMENTAL_FEATURES = env("EXPERIMENTAL_FEATURES", "0") == "1"
plugin = Plugin() plugin = Plugin()
@@ -21,12 +17,11 @@ def on_openchannel(openchannel, plugin, **kwargs):
return {'result': 'reject', 'error_message': msg} return {'result': 'reject', 'error_message': msg}
if EXPERIMENTAL_FEATURES: @plugin.hook('openchannel2')
@plugin.hook('openchannel2') def on_openchannel2(openchannel2, plugin, **kwargs):
def on_openchannel2(openchannel2, plugin, **kwargs): msg = "reject on principle"
msg = "reject on principle" plugin.log(msg)
plugin.log(msg) return {'result': 'reject', 'error_message': msg}
return {'result': 'reject', 'error_message': msg}
plugin.run() plugin.run()

17
tests/plugins/reject_odd_funding_amounts.py
View File

@@ -5,14 +5,10 @@ We just refuse to let them open channels with an odd amount of millisatoshis.
""" """
from pyln.client import Plugin, Millisatoshi from pyln.client import Plugin, Millisatoshi
from pyln.testing.utils import env
plugin = Plugin() plugin = Plugin()
EXPERIMENTAL_FEATURES = env("EXPERIMENTAL_FEATURES", "0") == "1"
def run_check(funding_amt_str): def run_check(funding_amt_str):
if Millisatoshi(funding_amt_str).to_satoshi() % 2 == 1: if Millisatoshi(funding_amt_str).to_satoshi() % 2 == 1:
return {'result': 'reject', 'error_message': "I don't like odd amounts"} return {'result': 'reject', 'error_message': "I don't like odd amounts"}
@@ -28,14 +24,13 @@ def on_openchannel(openchannel, plugin, **kwargs):
return run_check(openchannel['funding_satoshis']) return run_check(openchannel['funding_satoshis'])
if EXPERIMENTAL_FEATURES: @plugin.hook('openchannel2')
@plugin.hook('openchannel2') def on_openchannel2(openchannel2, plugin, **kwargs):
def on_openchannel2(openchannel2, plugin, **kwargs): print("{} VARS".format(len(openchannel2.keys())))
print("{} VARS".format(len(openchannel2.keys()))) for k in sorted(openchannel2.keys()):
for k in sorted(openchannel2.keys()): print("{}={}".format(k, openchannel2[k]))
print("{}={}".format(k, openchannel2[k]))
return run_check(openchannel2['their_funding']) return run_check(openchannel2['their_funding'])
plugin.run() plugin.run()