From f24eae60b78a46f0feeb2726b1541166c4193069 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Wed, 21 Feb 2018 16:50:49 +0100 Subject: [PATCH] Remove unused parameter why in delete_channel(..., const char *why) --- lightningd/channel.c | 3 +-- lightningd/channel.h | 4 +--- lightningd/onchain_control.c | 2 +- lightningd/peer_control.c | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lightningd/channel.c b/lightningd/channel.c index 0b4b83a62..dfc4d939c 100644 --- a/lightningd/channel.c +++ b/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); diff --git a/lightningd/channel.h b/lightningd/channel.h index e672dff66..9738e7847 100644 --- a/lightningd/channel.h +++ b/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); diff --git a/lightningd/onchain_control.c b/lightningd/onchain_control.c index 020544a29..0269f479e 100644 --- a/lightningd/onchain_control.c +++ b/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); } /** diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c index 5b32ad4c5..f880de04d 100644 --- a/lightningd/peer_control.c +++ b/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); }