Un-break master after merging #389

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>

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		\

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_failed(PEER_FD,
-			    &peer->pcs.cs,
+			    &peer->cs,
 			    &peer->channel_id,
 			    "Unexpected revoke_and_ack");
 	}