diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimiters.java b/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimiters.java index 4b510e0fc..49e728873 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimiters.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimiters.java @@ -19,10 +19,6 @@ public class RateLimiters extends BaseRateLimiters { public enum For implements RateLimiterDescriptor { BACKUP_AUTH_CHECK("backupAuthCheck", false, new RateLimiterConfig(100, Duration.ofMinutes(15))), SMS_DESTINATION("smsDestination", false, new RateLimiterConfig(2, Duration.ofSeconds(30))), - VOICE_DESTINATION("voxDestination", false, new RateLimiterConfig(2, Duration.ofMinutes(2))), - VOICE_DESTINATION_DAILY("voxDestinationDaily", false, new RateLimiterConfig(10, Duration.ofMinutes(144))), - SMS_VOICE_IP("smsVoiceIp", false, new RateLimiterConfig(1000, Duration.ofMillis(60))), - SMS_VOICE_PREFIX("smsVoicePrefix", false, new RateLimiterConfig(1000, Duration.ofMillis(60))), VERIFY("verify", false, new RateLimiterConfig(6, Duration.ofSeconds(30))), PIN("pin", false, new RateLimiterConfig(10, Duration.ofDays(1))), ATTACHMENT("attachmentCreate", false, new RateLimiterConfig(50, Duration.ofMillis(1200))), @@ -126,22 +122,6 @@ public class RateLimiters extends BaseRateLimiters { return forDescriptor(For.SMS_DESTINATION); } - public RateLimiter getSmsVoiceIpLimiter() { - return forDescriptor(For.SMS_VOICE_IP); - } - - public RateLimiter getSmsVoicePrefixLimiter() { - return forDescriptor(For.SMS_VOICE_PREFIX); - } - - public RateLimiter getVoiceDestinationLimiter() { - return forDescriptor(For.VOICE_DESTINATION); - } - - public RateLimiter getVoiceDestinationDailyLimiter() { - return forDescriptor(For.VOICE_DESTINATION_DAILY); - } - public RateLimiter getVerifyLimiter() { return forDescriptor(For.VERIFY); } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DeviceControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DeviceControllerTest.java index 46ce4b4f4..7f6d84087 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DeviceControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DeviceControllerTest.java @@ -133,7 +133,6 @@ class DeviceControllerTest { @BeforeEach void setup() { when(rateLimiters.getSmsDestinationLimiter()).thenReturn(rateLimiter); - when(rateLimiters.getVoiceDestinationLimiter()).thenReturn(rateLimiter); when(rateLimiters.getVerifyLimiter()).thenReturn(rateLimiter); when(rateLimiters.getAllocateDeviceLimiter()).thenReturn(rateLimiter); when(rateLimiters.getVerifyDeviceLimiter()).thenReturn(rateLimiter); diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/limits/RateLimitersTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/limits/RateLimitersTest.java index 3ba138bca..52b740ff1 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/limits/RateLimitersTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/limits/RateLimitersTest.java @@ -43,7 +43,7 @@ public class RateLimitersTest { private static final String BAD_YAML = """ limits: - smsVoicePrefix: + prekeys: bucketSize: 150 permitRegenerationDuration: PT6S unexpected: @@ -53,7 +53,7 @@ public class RateLimitersTest { private static final String GOOD_YAML = """ limits: - smsVoicePrefix: + prekeys: bucketSize: 150 permitRegenerationDuration: PT6S attachmentCreate: