diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfiguration.java index f64347f0b..9b2bf9cb8 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfiguration.java @@ -26,10 +26,6 @@ public class DynamicConfiguration { @Valid private DynamicRemoteDeprecationConfiguration remoteDeprecation = new DynamicRemoteDeprecationConfiguration(); - @JsonProperty - @Valid - private DynamicMessageRateConfiguration messageRate = new DynamicMessageRateConfiguration(); - @JsonProperty @Valid private DynamicPaymentsConfiguration payments = new DynamicPaymentsConfiguration(); @@ -73,10 +69,6 @@ public class DynamicConfiguration { return remoteDeprecation; } - public DynamicMessageRateConfiguration getMessageRateConfiguration() { - return messageRate; - } - public DynamicPaymentsConfiguration getPaymentsConfiguration() { return payments; } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicMessageRateConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicMessageRateConfiguration.java deleted file mode 100644 index fdf8d145d..000000000 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicMessageRateConfiguration.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2021 Signal Messenger, LLC - * SPDX-License-Identifier: AGPL-3.0-only - */ - -package org.whispersystems.textsecuregcm.configuration.dynamic; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class DynamicMessageRateConfiguration { - - @JsonProperty - private boolean enforceUnsealedSenderRateLimit = false; - - public boolean isEnforceUnsealedSenderRateLimit() { - return enforceUnsealedSenderRateLimit; - } -} 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 d6bc62103..8dfb3b0fd 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 @@ -196,29 +196,6 @@ class DynamicConfigurationTest { } } - @Test - void testParseMessageRateConfiguration() throws JsonProcessingException { - { - final String emptyConfigYaml = "test: true"; - final DynamicConfiguration emptyConfig = - DynamicConfigurationManager.parseConfiguration(emptyConfigYaml, DynamicConfiguration.class).orElseThrow(); - - assertFalse(emptyConfig.getMessageRateConfiguration().isEnforceUnsealedSenderRateLimit()); - } - - { - final String messageRateConfigYaml = """ - messageRate: - enforceUnsealedSenderRateLimit: true - """; - - final DynamicConfiguration emptyConfig = - DynamicConfigurationManager.parseConfiguration(messageRateConfigYaml, DynamicConfiguration.class).orElseThrow(); - - assertTrue(emptyConfig.getMessageRateConfiguration().isEnforceUnsealedSenderRateLimit()); - } - } - @Test void testParseFeatureFlags() throws JsonProcessingException { {