pytest: remove EXPERIMENTAL_FEATURES as a consideration.

This currently means anchors tests are disabled, awaiting the
PR which implements zero-fee-htlc anchors to reenable them.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-05-22 10:21:44 +09:30
parent b8aa3a579e
commit c11ae1aa34
6 changed files with 23 additions and 59 deletions

View File

@@ -5,7 +5,6 @@ from pyln.client import Millisatoshi
from pyln.testing.utils import EXPERIMENTAL_DUAL_FUND
import time
EXPERIMENTAL_FEATURES = env("EXPERIMENTAL_FEATURES", "0") == "1"
COMPAT = env("COMPAT", "1") == "1"
# Big enough to make channels with 10k effective capacity, including Elements channels
@@ -25,8 +24,9 @@ def default_ln_port(network: str) -> int:
return network_map[network]
def anchor_expected():
return EXPERIMENTAL_FEATURES
def anchor_expected(*args):
"""Would this/these nodes all support anchors?"""
return False
def hex_bits(features):
@@ -42,13 +42,6 @@ def hex_bits(features):
def expected_peer_features(wumbo_channels=False, extra=[]):
"""Return the expected peer features hexstring for this configuration"""
features = [1, 5, 7, 8, 11, 13, 14, 17, 25, 27, 45, 47, 51]
if EXPERIMENTAL_FEATURES:
# OPT_ONION_MESSAGES
features += [39]
# option_anchor_outputs
features += [21]
# option_quiesce
features += [35]
if wumbo_channels:
features += [19]
if EXPERIMENTAL_DUAL_FUND:
@@ -62,13 +55,6 @@ def expected_peer_features(wumbo_channels=False, extra=[]):
def expected_node_features(wumbo_channels=False, extra=[]):
"""Return the expected node features hexstring for this configuration"""
features = [1, 5, 7, 8, 11, 13, 14, 17, 25, 27, 45, 47, 51, 55]
if EXPERIMENTAL_FEATURES:
# OPT_ONION_MESSAGES
features += [39]
# option_anchor_outputs
features += [21]
# option_quiesce
features += [35]
if wumbo_channels:
features += [19]
if EXPERIMENTAL_DUAL_FUND: