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

state: fix BITCOIN_HTLC_TOTHEM_SPENT idata.

Browse Source 
We use both union fields idata->btc and idata->htlc, which is clearly
wrong.  Have peer_tx_revealed_r_value return the HTLC it's talking
about.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-01-22 06:41:47 +10:30
parent 2b3d5b4049
commit 0db3c03ed1
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
state.c
View File

@@ -757,10 +757,11 @@ enum command_status state(const tal_t *ctx,
return next_state(peer, cstatus, return next_state(peer, cstatus,
BITS_TO_STATE(bits)); BITS_TO_STATE(bits));
} else if (input_is(input, BITCOIN_HTLC_TOTHEM_SPENT)) { } else if (input_is(input, BITCOIN_HTLC_TOTHEM_SPENT)) {
const struct htlc *htlc;
/* They revealed R value. */ /* They revealed R value. */
peer_tx_revealed_r_value(peer, idata->btc); htlc = peer_tx_revealed_r_value(peer, idata->btc);
/* We don't care any more. */ /* We don't care any more. */
peer_unwatch_htlc_output(peer, idata->htlc, peer_unwatch_htlc_output(peer, htlc,
INPUT_NO_MORE_HTLCS); INPUT_NO_MORE_HTLCS);
return unchanged_state(cstatus); return unchanged_state(cstatus);
} else if (input_is(input, BITCOIN_HTLC_TOTHEM_TIMEOUT)){ } else if (input_is(input, BITCOIN_HTLC_TOTHEM_TIMEOUT)){

2
state.h
View File

@@ -94,7 +94,7 @@ void peer_htlc_done(struct peer *peer);
void peer_htlc_aborted(struct peer *peer); void peer_htlc_aborted(struct peer *peer);
/* An on-chain transaction revealed an R value. */ /* An on-chain transaction revealed an R value. */
void peer_tx_revealed_r_value(struct peer *peer, const struct htlc *peer_tx_revealed_r_value(struct peer *peer,
const struct bitcoin_event *btc); const struct bitcoin_event *btc);
/* Create various kinds of packets, allocated off @ctx */ /* Create various kinds of packets, allocated off @ctx */

3
test/test_state_coverage.c
View File

@@ -1465,11 +1465,12 @@ void peer_htlc_declined(struct peer *peer, const Pkt *pkt)
peer->htlc_declined = true; peer->htlc_declined = true;
} }
void peer_tx_revealed_r_value(struct peer *peer, const struct htlc *peer_tx_revealed_r_value(struct peer *peer,
const struct bitcoin_event *btc) const struct bitcoin_event *btc)
{ {
const struct htlc *htlc = (struct htlc *)btc; const struct htlc *htlc = (struct htlc *)btc;
add_rval(peer, htlc->id); add_rval(peer, htlc->id);
return htlc;
} }
static const char *check_changes(const struct peer *old, struct peer *new, static const char *check_changes(const struct peer *old, struct peer *new,