Browse Source

Remove unused parameter why in delete_channel(..., const char *why)

ppa-0.6.1
practicalswift 7 years ago
committed by Christian Decker
parent
commit
f24eae60b7
  1. 3
      lightningd/channel.c
  2. 4
      lightningd/channel.h
  3. 2
      lightningd/onchain_control.c
  4. 2
      lightningd/peer_control.c

3
lightningd/channel.c

@ -54,8 +54,7 @@ static void destroy_channel(struct channel *channel)
list_del_from(&channel->peer->channels, &channel->list);
}
/* FIXME: remove why */
void delete_channel(struct channel *channel, const char *why)
void delete_channel(struct channel *channel)
{
struct peer *peer = channel->peer;
wallet_channel_delete(channel->peer->ld->wallet, channel->dbid);

4
lightningd/channel.h

@ -121,9 +121,7 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
struct changed_htlc *last_sent_commit,
u32 first_blocknum);
/* This lets us give a more detailed error than just a destructor, and
* deletes from db. */
void delete_channel(struct channel *channel, const char *why);
void delete_channel(struct channel *channel);
const char *channel_state_name(const struct channel *channel);
const char *channel_state_str(enum channel_state state);

2
lightningd/onchain_control.c

@ -223,7 +223,7 @@ static void handle_irrevocably_resolved(struct channel *channel, const u8 *msg)
log_info(channel->log, "onchaind complete, forgetting peer");
/* This will also free onchaind. */
delete_channel(channel, "onchaind complete, forgetting peer");
delete_channel(channel);
}
/**

2
lightningd/peer_control.c

@ -1014,7 +1014,7 @@ static void process_dev_forget_channel(struct bitcoind *bitcoind UNUSED,
json_add_txid(response, "funding_txid", &forget->channel->funding_txid);
json_object_end(response);
delete_channel(forget->channel, "dev-forget-channel called");
delete_channel(forget->channel);
command_success(forget->cmd, response);
}

Loading…
Cancel
Save