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

onchaind: fix confusing message about delayed txs.

Browse Source 
We say "in N blocks" but we actually mean "N blocks after this tx" which is
actually N-1 or less.  Change wording and tighten tests which misunderstood
this.

Also, the 'assert not l1.daemon.is_in_log('onchaind complete, forgetting peer')'
are unlikely to work until the daemon has actually seen the block, so add
sync_blockheight before all of those.

These changes reveal some sloppy testing, which we fix.
  
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-03-07 10:36:57 +10:30
committed by Christian Decker
parent a48c300df2
commit 25cb8caae8
2 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
onchaind/onchain.c
View File

@@ -341,7 +341,7 @@ static void propose_resolution(struct tracked_output *out,
unsigned int depth_required,
enum tx_type tx_type)
{
status_trace("Propose handling %s/%s by %s (%s) in %u blocks",
status_trace("Propose handling %s/%s by %s (%s) after %u blocks",
tx_type_name(out->tx_type),
output_type_name(out->output_type),
tx_type_name(tx_type),