Skip to content

Commit

Permalink
pytest: fix up rbf tests which use dev-disconnect.
Browse files Browse the repository at this point in the history
They must be marked DEVELOPER-only.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
rustyrussell committed Mar 17, 2021
1 parent aea63fa commit 913ea4e
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions tests/test_opening.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ def find_next_feerate(node, peer):


@unittest.skipIf(not DEVELOPER, "disconnect=... needs DEVELOPER=1")
@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
def test_multifunding_v2_best_effort(node_factory, bitcoind):
'''
Check that best_effort flag works.
Expand Down Expand Up @@ -100,6 +101,7 @@ def get_funded_channel_scid(n1, n2):


@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
def test_v2_open_sigs_restart(node_factory, bitcoind):
disconnects_1 = ['-WIRE_TX_SIGNATURES']
disconnects_2 = ['+WIRE_TX_SIGNATURES']
Expand Down Expand Up @@ -143,6 +145,7 @@ def test_v2_open_sigs_restart(node_factory, bitcoind):


@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
def test_v2_open_sigs_restart_while_dead(node_factory, bitcoind):
# Same thing as above, except the transaction mines
# while we're asleep
Expand Down Expand Up @@ -350,6 +353,7 @@ def test_v2_rbf_multi(node_factory, bitcoind, chainparams):


@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
def test_rbf_reconnect_init(node_factory, bitcoind, chainparams):
disconnects = ['-WIRE_INIT_RBF',
'@WIRE_INIT_RBF',
Expand Down Expand Up @@ -401,6 +405,7 @@ def test_rbf_reconnect_init(node_factory, bitcoind, chainparams):


@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
def test_rbf_reconnect_ack(node_factory, bitcoind, chainparams):
disconnects = ['-WIRE_ACK_RBF',
'@WIRE_ACK_RBF',
Expand Down Expand Up @@ -452,6 +457,7 @@ def test_rbf_reconnect_ack(node_factory, bitcoind, chainparams):


@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
def test_rbf_reconnect_tx_construct(node_factory, bitcoind, chainparams):
disconnects = ['=WIRE_TX_ADD_INPUT', # Initial funding succeeds
'-WIRE_TX_ADD_INPUT',
Expand Down Expand Up @@ -519,6 +525,7 @@ def test_rbf_reconnect_tx_construct(node_factory, bitcoind, chainparams):


@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
def test_rbf_reconnect_tx_sigs(node_factory, bitcoind, chainparams):
disconnects = ['=WIRE_TX_SIGNATURES', # Initial funding succeeds
'-WIRE_TX_SIGNATURES', # When we send tx-sigs, RBF
Expand Down

0 comments on commit 913ea4e

Please sign in to comment.