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

tests: anchors is only EXPERIMENTAL_FEATURES

Browse Source 
we've removed the EXPERIMENTAL_DUAL_FUND requirement
This commit is contained in:
niftynei
2022-10-19 15:45:05 -05:00
committed by Rusty Russell
parent 0b8ea2299a
commit cbe38dd350
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/test_connection.py
View File

@@ -9,7 +9,8 @@ from utils import (
expected_channel_features, expected_channel_features,
check_coin_moves, first_channel_id, account_balance, basic_fee, check_coin_moves, first_channel_id, account_balance, basic_fee,
scriptpubkey_addr, default_ln_port, scriptpubkey_addr, default_ln_port,
EXPERIMENTAL_FEATURES, mine_funding_to_announce, first_scid EXPERIMENTAL_FEATURES, mine_funding_to_announce, first_scid,
anchor_expected
) )
from pyln.testing.utils import SLOW_MACHINE, VALGRIND, EXPERIMENTAL_DUAL_FUND, FUNDAMOUNT from pyln.testing.utils import SLOW_MACHINE, VALGRIND, EXPERIMENTAL_DUAL_FUND, FUNDAMOUNT
@@ -378,7 +379,7 @@ def test_opening_tiny_channel(node_factory):
reserves = 2 * dustlimit reserves = 2 * dustlimit
min_commit_tx_fees = basic_fee(7500) min_commit_tx_fees = basic_fee(7500)
overhead = reserves + min_commit_tx_fees overhead = reserves + min_commit_tx_fees
if EXPERIMENTAL_FEATURES or EXPERIMENTAL_DUAL_FUND: if anchor_expected():
# Gotta fund those anchors too! # Gotta fund those anchors too!
overhead += 660 overhead += 660
@@ -2083,7 +2084,7 @@ def test_multifunding_feerates(node_factory, bitcoind):
# Because of how the anchor outputs protocol is designed, # Because of how the anchor outputs protocol is designed,
# we *always* pay for 2 anchor outs and their weight # we *always* pay for 2 anchor outs and their weight
if EXPERIMENTAL_FEATURES or EXPERIMENTAL_DUAL_FUND: # opt_anchor_outputs if anchor_expected():
weight = 1124 weight = 1124
else: else:
# the commitment transactions' feerate is calculated off # the commitment transactions' feerate is calculated off
@@ -2096,7 +2097,7 @@ def test_multifunding_feerates(node_factory, bitcoind):
# tx, but we subtract out the extra anchor output amount # tx, but we subtract out the extra anchor output amount
# from the to_us output, so it ends up inflating # from the to_us output, so it ends up inflating
# our fee by that much. # our fee by that much.
if EXPERIMENTAL_FEATURES or EXPERIMENTAL_DUAL_FUND: # opt_anchor_outputs if anchor_expected():
expected_fee += 330 expected_fee += 330
assert expected_fee == entry['fees']['base'] * 10 ** 8 assert expected_fee == entry['fees']['base'] * 10 ** 8

4
tests/utils.py
View File

@@ -22,7 +22,7 @@ def default_ln_port(network: str) -> int:
def anchor_expected(): def anchor_expected():
return EXPERIMENTAL_FEATURES or EXPERIMENTAL_DUAL_FUND return EXPERIMENTAL_FEATURES
def hex_bits(features): def hex_bits(features):
@@ -414,7 +414,7 @@ def first_scid(n1, n2):
def basic_fee(feerate): def basic_fee(feerate):
if EXPERIMENTAL_FEATURES or EXPERIMENTAL_DUAL_FUND: if anchor_expected():
# option_anchor_outputs # option_anchor_outputs
weight = 1124 weight = 1124
else: else: