mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

Un-break master after merging #389

Browse Source 
The #389 introduced some changes that conflicted with
9de3827199 so this ports those changes
into #389 and fixes the `master` branch again.

Lesson learned: always rebase a PR before merging.

Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker 2017-12-02 13:00:29 +01:00
parent 40516941af
commit 70bbc46304
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
channeld/Makefile
View File

@ -58,6 +58,7 @@ CHANNELD_COMMON_OBJS := \
common/timeout.o \ common/timeout.o \
common/type_to_string.o \ common/type_to_string.o \
common/utils.o \ common/utils.o \
common/utxo.o \
common/version.o \ common/version.o \
common/wireaddr.o \ common/wireaddr.o \
gossipd/gen_gossip_wire.o \ gossipd/gen_gossip_wire.o \

4
channeld/channel.c
View File

@ -1123,8 +1123,8 @@ static void handle_peer_revoke_and_ack(struct peer *peer, const u8 *msg)
} }
if (peer->revocations_received != peer->next_index[REMOTE] - 2) { if (peer->revocations_received != peer->next_index[REMOTE] - 2) {
peer_failed(io_conn_fd(peer->peer_conn), peer_failed(PEER_FD,
&peer->pcs.cs, &peer->cs,
&peer->channel_id, &peer->channel_id,
"Unexpected revoke_and_ack"); "Unexpected revoke_and_ack");
} }