mirror of
https://github.com/ElementsProject/lightning.git
synced 2025-01-17 19:03:42 +01:00
tests: move EXP_DF into the testing utils
This commit is contained in:
parent
7a488cc11e
commit
484d6bde83
@ -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):
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user