aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 07:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

peer_control: don't complete fundchannel command until broadcast.

Browse Source 
Under stress, the tests can mine blocks too soon, and the funding never
locks.  This gives more of a chance, at least.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-05-05 16:11:46 +09:30
parent 6dcd7f9d6d
commit 162dac1271
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lightningd/peer_control.c
View File

@@ -606,10 +606,6 @@ static bool opening_got_hsm_funding_sig(struct subd *hsm, const u8 *resp,
tal_count(sigs), tal_count(tx->input)); tal_count(sigs), tal_count(tx->input));
peer_set_condition(fc->peer, "Waiting for our funding tx"); peer_set_condition(fc->peer, "Waiting for our funding tx");
/* FIXME: Defer until after funding locked. */
tal_del_destructor(fc, fail_fundchannel_command);
command_success(fc->cmd, null_response(fc->cmd));
fc->cmd = NULL;
/* Create input parts from signatures. */ /* Create input parts from signatures. */
for (i = 0; i < tal_count(tx->input); i++) { for (i = 0; i < tal_count(tx->input); i++) {
@@ -629,6 +625,11 @@ static bool opening_got_hsm_funding_sig(struct subd *hsm, const u8 *resp,
broadcast_tx(hsm->ld->topology, fc->peer, tx, funding_broadcast_failed); broadcast_tx(hsm->ld->topology, fc->peer, tx, funding_broadcast_failed);
watch_tx(fc->peer, fc->peer->ld->topology, fc->peer, tx, watch_tx(fc->peer, fc->peer->ld->topology, fc->peer, tx,
funding_depth_cb, NULL); funding_depth_cb, NULL);
/* We could defer until after funding locked, but makes testing
* harder. */
tal_del_destructor(fc, fail_fundchannel_command);
command_success(fc->cmd, null_response(fc->cmd));
tal_free(fc); tal_free(fc);
return true; return true;
} }

2
tests/test_lightningd.py
View File

@@ -148,6 +148,8 @@ class LightningDTests(BaseLightningDTests):
l1.rpc.addfunds(tx) l1.rpc.addfunds(tx)
l1.rpc.fundchannel(l2.info['id'], amount) l1.rpc.fundchannel(l2.info['id'], amount)
# Technically, this is async to fundchannel.
l1.daemon.wait_for_log('sendrawtx exit 0')
l1.bitcoin.rpc.generate(6) l1.bitcoin.rpc.generate(6)