Skip to content

Commit ab5fb16

Browse files
committed
tests: skip splicing / dual-funding tests when VLS_SKIP_SPLICE_TESTS
1 parent b513593 commit ab5fb16

File tree

4 files changed

+27
-1
lines changed

4 files changed

+27
-1
lines changed

tests/test_connection.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,7 @@ def test_disconnect_fundee(node_factory):
571571
assert len(l2.rpc.listpeers()) == 1
572572

573573

574+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
574575
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
575576
@pytest.mark.openchannel('v2')
576577
def test_disconnect_fundee_v2(node_factory):
@@ -647,6 +648,7 @@ def test_disconnect_half_signed_v2(node_factory):
647648
assert len(l1.rpc.listpeerchannels(l2.info['id'])['channels']) == 1
648649

649650

651+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
650652
@pytest.mark.openchannel('v1')
651653
@pytest.mark.openchannel('v2')
652654
def test_reconnect_signed(node_factory):
@@ -1210,7 +1212,8 @@ def test_v2_open(node_factory, bitcoind, chainparams):
12101212
result = l1.rpc.waitsendpay(p['payment_hash'])
12111213
assert(result['status'] == 'complete')
12121214

1213-
1215+
# policy failed: policy-onchain-no-channel-push validate_onchain_tx: channel push not allowed: dual-funding not supported yet
1216+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
12141217
@pytest.mark.openchannel('v1')
12151218
def test_funding_push(node_factory, bitcoind, chainparams):
12161219
""" Try to push peer some sats """
@@ -1834,6 +1837,7 @@ def test_multifunding_v1_v2_mixed(node_factory, bitcoind):
18341837
l1.rpc.pay(inv)
18351838

18361839

1840+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
18371841
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
18381842
@pytest.mark.openchannel('v2')
18391843
def test_multifunding_v2_exclusive(node_factory, bitcoind):

tests/test_opening.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ def test_v2_open_sigs_reconnect_2(node_factory, bitcoind):
172172
l2.daemon.wait_for_log(r'to CHANNELD_NORMAL')
173173

174174

175+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
175176
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
176177
@pytest.mark.openchannel('v2')
177178
def test_v2_open_sigs_reconnect_1(node_factory, bitcoind):
@@ -334,6 +335,7 @@ def test_v2_open_sigs_restart_while_dead(node_factory, bitcoind):
334335
l1.daemon.wait_for_log(r'to CHANNELD_NORMAL')
335336

336337

338+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
337339
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
338340
@pytest.mark.openchannel('v2')
339341
def test_v2_rbf_single(node_factory, bitcoind, chainparams):
@@ -515,6 +517,7 @@ def test_v2_rbf_abort_retry(node_factory, bitcoind, chainparams):
515517
assert not l2.daemon.is_in_log('WIRE_CHANNEL_REESTABLISH')
516518

517519

520+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
518521
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
519522
@pytest.mark.openchannel('v2')
520523
def test_v2_rbf_abort_channel_opens(node_factory, bitcoind, chainparams):
@@ -669,6 +672,7 @@ def test_v2_rbf_liquidity_ad(node_factory, bitcoind, chainparams):
669672
l1.daemon.wait_for_log('State changed from CLOSINGD_SIGEXCHANGE to CLOSINGD_COMPLETE')
670673

671674

675+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
672676
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
673677
@pytest.mark.openchannel('v2')
674678
def test_v2_rbf_multi(node_factory, bitcoind, chainparams):
@@ -859,6 +863,7 @@ def test_rbf_reconnect_ack(node_factory, bitcoind, chainparams):
859863
l1.rpc.openchannel_bump(chan_id, chan_amount, initpsbt['psbt'])
860864

861865

866+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
862867
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
863868
@pytest.mark.openchannel('v2')
864869
def test_rbf_reconnect_tx_construct(node_factory, bitcoind, chainparams):
@@ -980,6 +985,7 @@ def test_rbf_reconnect_tx_construct(node_factory, bitcoind, chainparams):
980985
l2.daemon.wait_for_log(r'to CHANNELD_NORMAL')
981986

982987

988+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
983989
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
984990
@pytest.mark.openchannel('v2')
985991
def test_rbf_reconnect_tx_sigs(node_factory, bitcoind, chainparams):
@@ -1061,6 +1067,7 @@ def test_rbf_reconnect_tx_sigs(node_factory, bitcoind, chainparams):
10611067
assert l1_funding_txid == l2_funding_txid
10621068

10631069

1070+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
10641071
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
10651072
@pytest.mark.openchannel('v2')
10661073
def test_rbf_to_chain_before_commit(node_factory, bitcoind, chainparams):
@@ -1162,6 +1169,7 @@ def test_rbf_no_overlap(node_factory, bitcoind, chainparams):
11621169
l1.rpc.openchannel_update(chan_id, bump['psbt'])
11631170

11641171

1172+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
11651173
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
11661174
@pytest.mark.openchannel('v2')
11671175
def test_rbf_fails_to_broadcast(node_factory, bitcoind, chainparams):
@@ -1243,6 +1251,7 @@ def run_retry():
12431251
assert last_txs['tx']
12441252

12451253

1254+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
12461255
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
12471256
@pytest.mark.openchannel('v2')
12481257
def test_rbf_broadcast_close_inflights(node_factory, bitcoind, chainparams):
@@ -1318,6 +1327,7 @@ def run_retry():
13181327
assert inflights[1]['scratch_txid'] not in bitcoind.rpc.getrawmempool()
13191328

13201329

1330+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
13211331
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
13221332
@pytest.mark.openchannel('v2')
13231333
def test_rbf_non_last_mined(node_factory, bitcoind, chainparams):
@@ -1418,6 +1428,7 @@ def censoring_sendrawtx(r):
14181428
l1.daemon.wait_for_log(r'to ONCHAIN')
14191429

14201430

1431+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
14211432
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
14221433
@pytest.mark.openchannel('v2')
14231434
def test_funder_options(node_factory, bitcoind):
@@ -1484,6 +1495,8 @@ def test_funder_options(node_factory, bitcoind):
14841495
assert chan_info['funding']['local_funds_msat'] == Millisatoshi('1000000000msat')
14851496

14861497

1498+
# policy-onchain-no-fund-inbound validate_onchain_tx: can't sign for inbound channel: dual-funding not supported yet
1499+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
14871500
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
14881501
def test_funder_contribution_limits(node_factory, bitcoind):
14891502
opts = {'experimental-dual-fund': None,
@@ -2334,6 +2347,7 @@ def _no_utxo_response(r):
23342347
wait_for(lambda: l2.rpc.listpeerchannels()['channels'] == [])
23352348

23362349

2350+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
23372351
@pytest.mark.openchannel('v2')
23382352
def test_openchannel_no_unconfirmed_inputs_accepter(node_factory, bitcoind):
23392353
""" If the accepter flags 'require-confirmed-inputs' for an open,

tests/test_splicing.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
)
1010

1111

12+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
1213
@pytest.mark.openchannel('v1')
1314
@pytest.mark.openchannel('v2')
1415
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
@@ -47,6 +48,7 @@ def test_splice(node_factory, bitcoind):
4748
assert l1.db_query("SELECT count(*) as c FROM channeltxs;")[0]['c'] == 0
4849

4950

51+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
5052
@pytest.mark.openchannel('v1')
5153
@pytest.mark.openchannel('v2')
5254
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
@@ -105,6 +107,7 @@ def test_splice_gossip(node_factory, bitcoind):
105107
assert not l2.daemon.is_in_log("invalid local_channel_announcement")
106108

107109

110+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
108111
@pytest.mark.openchannel('v1')
109112
@pytest.mark.openchannel('v2')
110113
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
@@ -139,6 +142,7 @@ def test_splice_listnodes(node_factory, bitcoind):
139142
wait_for(lambda: len(l2.rpc.listnodes()['nodes']) == 2)
140143

141144

145+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
142146
@pytest.mark.openchannel('v1')
143147
@pytest.mark.openchannel('v2')
144148
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
@@ -174,6 +178,7 @@ def test_splice_out(node_factory, bitcoind):
174178
assert l1.db_query("SELECT count(*) as c FROM channeltxs;")[0]['c'] == 0
175179

176180

181+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
177182
@pytest.mark.openchannel('v1')
178183
@pytest.mark.openchannel('v2')
179184
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
@@ -283,6 +288,7 @@ def test_commit_crash_splice(node_factory, bitcoind):
283288
assert l1.db_query("SELECT count(*) as c FROM channeltxs;")[0]['c'] == 0
284289

285290

291+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
286292
@pytest.mark.openchannel('v1')
287293
@pytest.mark.openchannel('v2')
288294
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')

tests/test_splicing_disconnect.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
)
99

1010

11+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
1112
@pytest.mark.openchannel('v1')
1213
@pytest.mark.openchannel('v2')
1314
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
@@ -62,6 +63,7 @@ def test_splice_disconnect_sig(node_factory, bitcoind):
6263
assert l1.db_query("SELECT count(*) as c FROM channeltxs;")[0]['c'] == 0
6364

6465

66+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
6567
@pytest.mark.openchannel('v1')
6668
@pytest.mark.openchannel('v2')
6769
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')

0 commit comments

Comments
 (0)