aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-21 08:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

df-tests: test_openchannel_hook_error_handling

Browse Source
This commit is contained in:
niftynei
2020-12-14 17:53:31 -06:00
committed by Christian Decker
parent 803d9701d3
commit 959ca793b0
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lightningd/dual_open_control.c
View File

@@ -437,8 +437,23 @@ openchannel2_hook_deserialize(struct openchannel2_payload *payload,
json_tok_full(buffer, toks)); json_tok_full(buffer, toks));
if (json_tok_streq(buffer, t_result, "reject")) { if (json_tok_streq(buffer, t_result, "reject")) {
/* Should not have set any other fields if 'reject'ing */
if (json_get_member(buffer, toks, "close_to"))
fatal("Plugin rejected openchannel2 but"
" also set close_to");
if (json_get_member(buffer, toks, "psbt"))
fatal("Plugin rejected openchannel2 but"
" also set `psbt`");
if (json_get_member(buffer, toks, "accepter_funding_msat"))
fatal("Plugin rejected openchannel2 but"
" also set `accepter_funding_psbt`");
if (json_get_member(buffer, toks, "funding_feerate"))
fatal("Plugin rejected openchannel2 but"
" also set `funding_feerate`");
const jsmntok_t *t_errmsg = json_get_member(buffer, toks, const jsmntok_t *t_errmsg = json_get_member(buffer, toks,
"error_message"); "error_message");
if (t_errmsg) if (t_errmsg)
payload->err_msg = json_strdup(payload, payload->err_msg = json_strdup(payload,
buffer, t_errmsg); buffer, t_errmsg);

4
tests/test_plugin.py
View File

@@ -625,9 +625,9 @@ def test_openchannel_hook_error_handling(node_factory, bitcoind):
l1.fundwallet(10**6) l1.fundwallet(10**6)
# next fundchannel should fail fatal() for l2 # next fundchannel should fail fatal() for l2
with pytest.raises(RpcError, match=r'Owning subdaemon openingd died'): with pytest.raises(RpcError, match=r'Owning subdaemon (openingd|dualopend) died'):
l1.rpc.fundchannel(l2.info['id'], 100004) l1.rpc.fundchannel(l2.info['id'], 100004)
assert l2.daemon.is_in_log("BROKEN.*Plugin rejected openchannel but also set close_to") assert l2.daemon.is_in_log("BROKEN.*Plugin rejected openchannel[2]? but also set close_to")
def test_openchannel_hook_chaining(node_factory, bitcoind): def test_openchannel_hook_chaining(node_factory, bitcoind):