df: anchor outputs are on if EXP_DF

So we should treat it the same as EXPERIMENTAL_FEATURES
This commit is contained in:
niftynei
2021-05-06 14:11:11 -05:00
committed by Rusty Russell
parent 484d6bde83
commit b4e24ac8ba
4 changed files with 23 additions and 15 deletions

View File

@@ -2,6 +2,7 @@ from pyln.testing.utils import TEST_NETWORK, TIMEOUT, VALGRIND, DEVELOPER, DEPRE
from pyln.testing.utils import env, only_one, wait_for, write_config, TailableProc, sync_blockheight, wait_channel_quiescent, get_tx_p2wsh_outnum # noqa: F401
import bitstring
from pyln.client import Millisatoshi
from pyln.testing.utils import EXPERIMENTAL_DUAL_FUND
EXPERIMENTAL_FEATURES = env("EXPERIMENTAL_FEATURES", "0") == "1"
COMPAT = env("COMPAT", "1") == "1"
@@ -29,6 +30,11 @@ def expected_peer_features(wumbo_channels=False, extra=[]):
features += [27]
if wumbo_channels:
features += [19]
if EXPERIMENTAL_DUAL_FUND:
# option_anchor_outputs
features += [21]
# option_dual_fund
features += [29]
return hex_bits(features + extra)
@@ -46,6 +52,11 @@ def expected_node_features(wumbo_channels=False, extra=[]):
features += [27]
if wumbo_channels:
features += [19]
if EXPERIMENTAL_DUAL_FUND:
# option_anchor_outputs
features += [21]
# option_dual_fund
features += [29]
return hex_bits(features + extra)
@@ -136,7 +147,7 @@ def first_channel_id(n1, n2):
def basic_fee(feerate):
if EXPERIMENTAL_FEATURES:
if EXPERIMENTAL_FEATURES or EXPERIMENTAL_DUAL_FUND:
# option_anchor_outputs
weight = 1124
else: