aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-05 23:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

df: add openchannel_abort command

Browse Source 
Allows us to clean up an in-progress open that we won't be completing

Changelog-Added: EXPERIMENTAL JSON-RPC: Permit user-initiated aborting of in-progress opens. Only valid for not-yet-committed opens and RBF-attempts
This commit is contained in:
niftynei
2021-03-09 15:14:08 -06:00
committed by Rusty Russell
parent 015a0555d0
commit bec96a6c5b
25 changed files with 266 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_opening.py
View File

@@ -96,8 +96,9 @@ def test_v2_rbf(node_factory, bitcoind, chainparams):
@unittest.skipIf(not EXPERIMENTAL_FEATURES, "dual-funding is experimental only")
def test_v2_rbf_multi(node_factory, bitcoind, chainparams):
l1, l2 = node_factory.get_nodes(2,
opts=[{'dev-force-features': '+223'},
{'dev-force-features': '+223'}])
opts={'dev-force-features': '+223',
'may_reconnect': True,
'allow_warning': True})
l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
amount = 2**24
@@ -116,6 +117,11 @@ def test_v2_rbf_multi(node_factory, bitcoind, chainparams):
# Check that we're waiting for lockin
l1.daemon.wait_for_log(' to DUALOPEND_AWAITING_LOCKIN')
# Attempt to do abort, should fail since we've
# already gotten an inflight
with pytest.raises(RpcError):
l1.rpc.openchannel_abort(chan_id)
next_feerate = find_next_feerate(l1, l2)
# Initiate an RBF
@@ -128,6 +134,14 @@ def test_v2_rbf_multi(node_factory, bitcoind, chainparams):
# Do the bump
bump = l1.rpc.openchannel_bump(chan_id, chan_amount, initpsbt['psbt'])
# Abort this open attempt! We will re-try
aborted = l1.rpc.openchannel_abort(chan_id)
assert not aborted['channel_canceled']
# Do the bump, again
l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
bump = l1.rpc.openchannel_bump(chan_id, chan_amount, initpsbt['psbt'])
update = l1.rpc.openchannel_update(chan_id, bump['psbt'])
assert update['commitments_secured']