diff --git a/contrib/pyln-testing/pyln/testing/utils.py b/contrib/pyln-testing/pyln/testing/utils.py index 3abe70973..18b886106 100644 --- a/contrib/pyln-testing/pyln/testing/utils.py +++ b/contrib/pyln-testing/pyln/testing/utils.py @@ -79,6 +79,7 @@ TEST_DEBUG = env("TEST_DEBUG", "0") == "1" SLOW_MACHINE = env("SLOW_MACHINE", "0") == "1" DEPRECATED_APIS = env("DEPRECATED_APIS", "0") == "1" TIMEOUT = int(env("TIMEOUT", 180 if SLOW_MACHINE else 60)) +EXPERIMENTAL_DUAL_FUND = env("EXPERIMENTAL_DUAL_FUND", "0") == "1" def wait_for(success, timeout=TIMEOUT): diff --git a/tests/test_closing.py b/tests/test_closing.py index 26ac825e0..069b7f8d2 100644 --- a/tests/test_closing.py +++ b/tests/test_closing.py @@ -2,11 +2,11 @@ from fixtures import * # noqa: F401,F403 from flaky import flaky from pyln.client import RpcError, Millisatoshi from shutil import copyfile -from pyln.testing.utils import SLOW_MACHINE +from pyln.testing.utils import SLOW_MACHINE, EXPERIMENTAL_DUAL_FUND from utils import ( only_one, sync_blockheight, wait_for, DEVELOPER, TIMEOUT, account_balance, first_channel_id, basic_fee, TEST_NETWORK, - EXPERIMENTAL_FEATURES, EXPERIMENTAL_DUAL_FUND, scriptpubkey_addr + EXPERIMENTAL_FEATURES, scriptpubkey_addr ) import os diff --git a/tests/test_connection.py b/tests/test_connection.py index e9b1e13e8..d763bd3fb 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -9,9 +9,9 @@ from utils import ( expected_channel_features, check_coin_moves, first_channel_id, account_balance, basic_fee, scriptpubkey_addr, - EXPERIMENTAL_FEATURES, EXPERIMENTAL_DUAL_FUND + EXPERIMENTAL_FEATURES ) -from pyln.testing.utils import SLOW_MACHINE, VALGRIND +from pyln.testing.utils import SLOW_MACHINE, VALGRIND, EXPERIMENTAL_DUAL_FUND import os import pytest diff --git a/tests/test_pay.py b/tests/test_pay.py index c46341a3f..79cc65f0c 100644 --- a/tests/test_pay.py +++ b/tests/test_pay.py @@ -4,9 +4,10 @@ from fixtures import TEST_NETWORK from flaky import flaky # noqa: F401 from pyln.client import RpcError, Millisatoshi from pyln.proto.onion import TlvPayload +from pyln.testing.utils import EXPERIMENTAL_DUAL_FUND from utils import ( DEVELOPER, wait_for, only_one, sync_blockheight, TIMEOUT, - EXPERIMENTAL_FEATURES, env, VALGRIND, EXPERIMENTAL_DUAL_FUND + EXPERIMENTAL_FEATURES, env, VALGRIND ) import copy import os diff --git a/tests/utils.py b/tests/utils.py index 48394f1d3..843f2f859 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -5,7 +5,6 @@ from pyln.client import Millisatoshi EXPERIMENTAL_FEATURES = env("EXPERIMENTAL_FEATURES", "0") == "1" COMPAT = env("COMPAT", "1") == "1" -EXPERIMENTAL_DUAL_FUND = env("EXPERIMENTAL_DUAL_FUND", "0") == "1" def hex_bits(features):