From 616db337e13d0361cc51d85b43d9ee31db1bd5e3 Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Wed, 8 Dec 2021 13:41:57 -0500 Subject: [PATCH] Remove an old rate limiting feature flag --- .../dynamic/DynamicRateLimitChallengeConfiguration.java | 7 ------- .../configuration/dynamic/DynamicConfigurationTest.java | 3 --- 2 files changed, 10 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicRateLimitChallengeConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicRateLimitChallengeConfiguration.java index 5679fefa7..ebaa0f23c 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicRateLimitChallengeConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicRateLimitChallengeConfiguration.java @@ -11,9 +11,6 @@ import javax.validation.constraints.NotNull; public class DynamicRateLimitChallengeConfiguration { - @JsonProperty - boolean unsealedSenderLimitEnforced = false; - @JsonProperty @NotNull private Map clientSupportedVersions = Collections.emptyMap(); @@ -26,8 +23,4 @@ public class DynamicRateLimitChallengeConfiguration { public Optional getMinimumSupportedVersion(final ClientPlatform platform) { return Optional.ofNullable(clientSupportedVersions.get(platform)); } - - public boolean isUnsealedSenderLimitEnforced() { - return unsealedSenderLimitEnforced; - } } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfigurationTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfigurationTest.java index bc1807ba3..833f8d7f2 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfigurationTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfigurationTest.java @@ -355,13 +355,11 @@ class DynamicConfigurationTest { DynamicConfigurationManager.parseConfiguration(emptyConfigYaml, DynamicConfiguration.class).orElseThrow(); assertThat(emptyConfig.getRateLimitChallengeConfiguration().getClientSupportedVersions()).isEmpty(); - assertThat(emptyConfig.getRateLimitChallengeConfiguration().isUnsealedSenderLimitEnforced()).isFalse(); } { final String rateLimitChallengeConfig = """ rateLimitChallenge: - unsealedSenderLimitEnforced: true clientSupportedVersions: IOS: 5.1.0 ANDROID: 5.2.0 @@ -377,7 +375,6 @@ class DynamicConfigurationTest { assertThat(clientSupportedVersions.get(ClientPlatform.IOS)).isEqualTo(new Semver("5.1.0")); assertThat(clientSupportedVersions.get(ClientPlatform.ANDROID)).isEqualTo(new Semver("5.2.0")); assertThat(clientSupportedVersions.get(ClientPlatform.DESKTOP)).isEqualTo(new Semver("5.0.0")); - assertThat(rateLimitChallengeConfiguration.isUnsealedSenderLimitEnforced()).isTrue(); } }