mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 06:41:44 +01:00
Code Issues Projects Releases Wiki Activity

channeld: don't assert that we're expecting revoke_and_ack.

Browse source 
We can have it happen on reconnect due to fee changes; we should really
detect this case, but it's harmless to let it happen as a noop.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-11-21 13:46:47 +10:30 • committed by Christian Decker
parent d28ee02cbf
commit c3cb7f1c85
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
channeld/channel.c
View file

@ -1114,11 +1114,9 @@ static struct io_plan *handle_peer_revoke_and_ack(struct io_conn *conn,
"Bad revoke_and_ack %s", tal_hex(msg, msg));
}
if (!channel_awaiting_revoke_and_ack(peer->channel))
peer_failed(io_conn_fd(peer->peer_conn),
&peer->pcs.cs,
&peer->channel_id,
"Unexpected revoke_and_ack");
/* FIXME: We can get unexpected revoke_and_ack due to retransmit; we
* should really detect this case and set
* channel_awaiting_revoke_and_ack; normally it will be true here. */
/* BOLT #2:
*

1
channeld/full_channel.c
View file

@ -795,7 +795,6 @@ bool channel_rcvd_revoke_and_ack(struct channel *channel,
if (change & HTLC_LOCAL_F_PENDING)
channel->changes_pending[LOCAL] = true;
assert(channel->awaiting_revoke_and_ack);
channel->awaiting_revoke_and_ack = false;
/* For funder, ack also means time to apply new feerate locally. */