From 5f5d0b3e25cde69a5e397c48661b775274232a81 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 2 Mar 2018 19:29:16 +1030 Subject: [PATCH] gossip_local_add_channel: remove unused flags field. Signed-off-by: Rusty Russell --- channeld/channel.c | 2 +- gossipd/gossip.c | 7 ++----- gossipd/gossip_wire.csv | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/channeld/channel.c b/channeld/channel.c index ebe28241f..14d639c5d 100644 --- a/channeld/channel.c +++ b/channeld/channel.c @@ -341,7 +341,7 @@ static void send_temporary_announcement(struct peer *peer) msg = towire_gossip_local_add_channel( tmpctx, &peer->short_channel_ids[LOCAL], &peer->chain_hash, - &peer->node_ids[REMOTE], 0 /* flags */, peer->cltv_delta, + &peer->node_ids[REMOTE], peer->cltv_delta, peer->conf[REMOTE].htlc_minimum_msat, peer->fee_base, peer->fee_per_satoshi); wire_sync_write(GOSSIP_FD, take(msg)); diff --git a/gossipd/gossip.c b/gossipd/gossip.c index be3a0943e..fdbb7c72f 100644 --- a/gossipd/gossip.c +++ b/gossipd/gossip.c @@ -764,13 +764,13 @@ static void handle_local_add_channel(struct peer *peer, u8 *msg) struct short_channel_id scid; struct bitcoin_blkid chain_hash; struct pubkey remote_node_id; - u16 flags, cltv_expiry_delta, direction; + u16 cltv_expiry_delta, direction; u32 fee_base_msat, fee_proportional_millionths; u64 htlc_minimum_msat; struct node_connection *c; if (!fromwire_gossip_local_add_channel( - msg, &scid, &chain_hash, &remote_node_id, &flags, + 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)); @@ -790,9 +790,6 @@ static void handle_local_add_channel(struct peer *peer, u8 *msg) return; } - /* FIXME: unused */ - (void)flags; - direction = get_channel_direction(&rstate->local_id, &remote_node_id); c = half_add_connection(rstate, &peer->daemon->id, &remote_node_id, &scid); diff --git a/gossipd/gossip_wire.csv b/gossipd/gossip_wire.csv index 979aa930f..a2cde59da 100644 --- a/gossipd/gossip_wire.csv +++ b/gossipd/gossip_wire.csv @@ -179,7 +179,6 @@ gossip_local_add_channel,3017 gossip_local_add_channel,,short_channel_id,struct short_channel_id gossip_local_add_channel,,chain_hash,struct bitcoin_blkid gossip_local_add_channel,,remote_node_id,struct pubkey -gossip_local_add_channel,,flags,u16 gossip_local_add_channel,,cltv_expiry_delta,u16 gossip_local_add_channel,,htlc_minimum_msat,u64 gossip_local_add_channel,,fee_base_msat,u32