From 70bbc46304ab5995a0ba9fec48055427d7da548f Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Sat, 2 Dec 2017 13:00:29 +0100 Subject: [PATCH] Un-break master after merging #389 The #389 introduced some changes that conflicted with 9de382719930a607707c30c895f227bce40911fc 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 --- channeld/Makefile | 1 + channeld/channel.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/channeld/Makefile b/channeld/Makefile index 53a60ba80..e20e07674 100644 --- a/channeld/Makefile +++ b/channeld/Makefile @@ -58,6 +58,7 @@ CHANNELD_COMMON_OBJS := \ common/timeout.o \ common/type_to_string.o \ common/utils.o \ + common/utxo.o \ common/version.o \ common/wireaddr.o \ gossipd/gen_gossip_wire.o \ diff --git a/channeld/channel.c b/channeld/channel.c index 86ac7751b..2284eebb0 100644 --- a/channeld/channel.c +++ b/channeld/channel.c @@ -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) { - peer_failed(io_conn_fd(peer->peer_conn), - &peer->pcs.cs, + peer_failed(PEER_FD, + &peer->cs, &peer->channel_id, "Unexpected revoke_and_ack"); }