Browse Source

gossip_local_add_channel: remove unused flags field.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 7 years ago
committed by Christian Decker
parent
commit
5f5d0b3e25
  1. 2
      channeld/channel.c
  2. 7
      gossipd/gossip.c
  3. 1
      gossipd/gossip_wire.csv

2
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));

7
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);

1
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

Can't render this file because it has a wrong number of fields in line 6.
Loading…
Cancel
Save