diff --git a/channeld/channeld_htlc.h b/channeld/channeld_htlc.h index 3dcaf5490..17e811bc2 100644 --- a/channeld/channeld_htlc.h +++ b/channeld/channeld_htlc.h @@ -70,11 +70,6 @@ static inline struct htlc *htlc_get(struct htlc_map *htlcs, u64 id, enum side ow return NULL; } -static inline size_t htlc_map_count(const struct htlc_map *htlcs) -{ - return htlcs->raw.elems; -} - /* FIXME: Move these out of the hash! */ static inline bool htlc_is_dead(const struct htlc *htlc) { diff --git a/common/htlc.h b/common/htlc.h index 92d751586..112d8b6aa 100644 --- a/common/htlc.h +++ b/common/htlc.h @@ -73,12 +73,4 @@ static inline const char *side_to_str(enum side side) } abort(); } - -static inline enum side str_to_side(const char *str) -{ - if (streq(str, "LOCAL")) - return LOCAL; - assert(streq(str, "REMOTE")); - return REMOTE; -} #endif /* LIGHTNING_COMMON_HTLC_H */ diff --git a/common/json_escaped.c b/common/json_escaped.c index 595a26c73..9ae0b156a 100644 --- a/common/json_escaped.c +++ b/common/json_escaped.c @@ -24,11 +24,6 @@ struct json_escaped *json_tok_escaped_string(const tal_t *ctx, tok->end - tok->start); } -bool json_escaped_streq(const struct json_escaped *esc, const char *str) -{ - return streq(esc->s, str); -} - bool json_escaped_eq(const struct json_escaped *a, const struct json_escaped *b) { diff --git a/common/json_escaped.h b/common/json_escaped.h index 333849f5f..75eecdb18 100644 --- a/common/json_escaped.h +++ b/common/json_escaped.h @@ -21,10 +21,6 @@ struct json_escaped *json_tok_escaped_string(const tal_t *ctx, const char *buffer, const jsmntok_t *tok); -/* Is @esc equal to @str */ -bool json_escaped_streq(const struct json_escaped *esc, const char *str); - - /* Are two escaped json strings identical? */ bool json_escaped_eq(const struct json_escaped *a, const struct json_escaped *b); diff --git a/lightningd/channel.h b/lightningd/channel.h index 0a46ac2f0..d4adaa516 100644 --- a/lightningd/channel.h +++ b/lightningd/channel.h @@ -187,11 +187,6 @@ static inline bool channel_active(const struct channel *channel) && !channel_on_chain(channel); } -static inline bool channel_wants_reconnect(const struct channel *channel) -{ - return channel->state <= CLOSINGD_COMPLETE; -} - void derive_channel_seed(struct lightningd *ld, struct privkey *seed, const struct pubkey *peer_id, const u64 dbid);