From 26deec0c82ea582554b3644b0d62a7bb9eaf8480 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 23 Jul 2018 11:52:36 +0930 Subject: [PATCH] channeld: remove duplicate call to channel_announcement_negotiate(). It's called in peer_reconnect, but the caller init_channel() calls it too. Signed-off-by: Rusty Russell --- channeld/channel.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/channeld/channel.c b/channeld/channel.c index 6ddced3e2..81629b0e4 100644 --- a/channeld/channel.c +++ b/channeld/channel.c @@ -2046,10 +2046,6 @@ static void peer_reconnect(struct peer *peer) send_fail_or_fulfill(peer, htlc); } - /* Reenable channel by sending a channel_update without the - * disable flag */ - channel_announcement_negotiate(peer); - /* Corner case: we will get upset with them if they send * commitment_signed with no changes. But it could be that we sent a * feechange, they acked, and now they want to commit it; we can't @@ -2535,6 +2531,7 @@ static void init_channel(struct peer *peer) if (funding_signed) enqueue_peer_msg(peer, take(funding_signed)); + /* Reenable channel */ channel_announcement_negotiate(peer); billboard_update(peer);