From a79879637a1aacf435b72b2555fabf9d8786b9e7 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 2 Mar 2018 19:29:16 +1030 Subject: [PATCH] gossipd: local_add_channel can just use get_channel() Also upgrade the status messages in the weird cases. Signed-off-by: Rusty Russell --- gossipd/gossip.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gossipd/gossip.c b/gossipd/gossip.c index 3c26edcf9..576f9ad02 100644 --- a/gossipd/gossip.c +++ b/gossipd/gossip.c @@ -772,20 +772,19 @@ static void handle_local_add_channel(struct peer *peer, u8 *msg) msg, &scid, &chain_hash, &remote_node_id, &cltv_expiry_delta, &htlc_minimum_msat, &fee_base_msat, &fee_proportional_millionths)) { - status_trace("Unable to parse local_add_channel message: %s", tal_hex(msg, msg)); + status_broken("Unable to parse local_add_channel message: %s", tal_hex(msg, msg)); return; } if (!structeq(&chain_hash, &rstate->chain_hash)) { - status_trace("Received channel_announcement for unknown chain %s", + status_broken("Received local_add_channel for unknown chain %s", type_to_string(msg, struct bitcoin_blkid, &chain_hash)); return; } - /* FIXME: use uintmap_get */ - if (get_connection_by_scid(rstate, &scid, 0) || get_connection_by_scid(rstate, &scid, 1)) { - status_trace("Attempted to local_add_channel a know channel"); + if (get_channel(rstate, &scid)) { + status_broken("Attempted to local_add_channel a known channel"); return; }