From a943a5365824920189882833568362bdc3219784 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 29 Jan 2024 10:04:16 +1030 Subject: [PATCH] common: channel_type_accept doesn't use `their_features`; remove parameter. Signed-off-by: Rusty Russell --- common/channel_type.c | 3 +-- common/channel_type.h | 3 +-- openingd/dualopend.c | 3 +-- openingd/openingd.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/common/channel_type.c b/common/channel_type.c index fef29e4cb..0c844e80f 100644 --- a/common/channel_type.c +++ b/common/channel_type.c @@ -141,8 +141,7 @@ struct channel_type *channel_type_from(const tal_t *ctx, struct channel_type *channel_type_accept(const tal_t *ctx, const u8 *t, - const struct feature_set *our_features, - const u8 *their_features) + const struct feature_set *our_features) { struct channel_type *ctype, proposed; /* Need to copy since we're going to blank variant bits for equality. */ diff --git a/common/channel_type.h b/common/channel_type.h index c1f1d7978..95edab6f8 100644 --- a/common/channel_type.h +++ b/common/channel_type.h @@ -41,8 +41,7 @@ bool channel_type_eq(const struct channel_type *a, /* Return channel_type if this is acceptable, otherwise NULL */ struct channel_type *channel_type_accept(const tal_t *ctx, const u8 *t, - const struct feature_set *our_features, - const u8 *their_features); + const struct feature_set *our_features); /* Return an array of feature strings indicating channel type. */ const char **channel_type_name(const tal_t *ctx, const struct channel_type *t); diff --git a/openingd/dualopend.c b/openingd/dualopend.c index cf7051515..70e2b0779 100644 --- a/openingd/dualopend.c +++ b/openingd/dualopend.c @@ -2422,8 +2422,7 @@ static void accepter_start(struct state *state, const u8 *oc2_msg) state->channel_type = channel_type_accept(state, open_tlv->channel_type, - state->our_features, - state->their_features); + state->our_features); if (!state->channel_type) { negotiation_failed(state, "Did not support channel_type %s", diff --git a/openingd/openingd.c b/openingd/openingd.c index 1ad35c11a..8ee377b53 100644 --- a/openingd/openingd.c +++ b/openingd/openingd.c @@ -943,8 +943,7 @@ static u8 *fundee_channel(struct state *state, const u8 *open_channel_msg) if (open_tlvs->channel_type) { open_channel_had_channel_type = true; state->channel_type = channel_type_accept( - state, open_tlvs->channel_type, state->our_features, - state->their_features); + state, open_tlvs->channel_type, state->our_features); if (!state->channel_type) { negotiation_failed(state, "Did not support channel_type %s",