From b0ec5585ce5f70897bdb199946300a73240c0dd7 Mon Sep 17 00:00:00 2001 From: meskio Date: Tue, 25 Feb 2025 16:07:50 +0100 Subject: [PATCH] relay: add settings distribution setting and remove moat moat is being deprecated and replaced by settings. Let's not give a warning if 'settings' is set but do if 'moat' is set. --- src/feature/relay/relay_config.c | 4 ++-- src/test/test_config.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index 320ce8d13a..cc4d8ab420 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -693,7 +693,7 @@ compute_publishserverdescriptor(or_options_t *options) * - "any" * - "https" * - "email" - * - "moat" + * - "settings" * * If the option string is unrecognised, a warning will be logged and 0 is * returned. If the option string contains an invalid character, -1 is @@ -706,7 +706,7 @@ check_bridge_distribution_setting(const char *bd) return 0; const char *RECOGNIZED[] = { - "none", "any", "https", "email", "moat" + "none", "any", "https", "email", "settings" }; unsigned i; for (i = 0; i < ARRAY_LENGTH(RECOGNIZED); ++i) { diff --git a/src/test/test_config.c b/src/test/test_config.c index c45b10657b..f0d3c8996d 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -6321,14 +6321,14 @@ test_config_check_bridge_distribution_setting_valid(void *arg) tt_int_op(check_bridge_distribution_setting("any"), OP_EQ, 0); tt_int_op(check_bridge_distribution_setting("https"), OP_EQ, 0); tt_int_op(check_bridge_distribution_setting("email"), OP_EQ, 0); - tt_int_op(check_bridge_distribution_setting("moat"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("settings"), OP_EQ, 0); // Check all the possible values we support right now with weird casing. tt_int_op(check_bridge_distribution_setting("NoNe"), OP_EQ, 0); tt_int_op(check_bridge_distribution_setting("anY"), OP_EQ, 0); tt_int_op(check_bridge_distribution_setting("hTTps"), OP_EQ, 0); tt_int_op(check_bridge_distribution_setting("emAIl"), OP_EQ, 0); - tt_int_op(check_bridge_distribution_setting("moAt"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("setTIngS"), OP_EQ, 0); // Invalid values. tt_int_op(check_bridge_distribution_setting("x\rx"), OP_EQ, -1); -- 2.47.3