From c84d96abeeef752afdaccdf19669a0fd9a88a8c8 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 20 Dec 2024 11:59:42 -0600
Subject: [PATCH] Remove deprecated svr3Credentials field

---
 .../auth/RegistrationLockVerificationManager.java            | 3 +--
 .../textsecuregcm/entities/RegistrationLockFailure.java      | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/RegistrationLockVerificationManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/RegistrationLockVerificationManager.java
index 425f64ef8..ab0d8f9a4 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/RegistrationLockVerificationManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/RegistrationLockVerificationManager.java
@@ -169,8 +169,7 @@ public class RegistrationLockVerificationManager {
       throw new WebApplicationException(Response.status(FAILURE_HTTP_STATUS)
           .entity(new RegistrationLockFailure(
               existingRegistrationLock.getTimeRemaining().toMillis(),
-              svr2FailureCredentials(existingRegistrationLock, updatedAccount),
-              null))
+              svr2FailureCredentials(existingRegistrationLock, updatedAccount)))
           .build());
     }
 
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLockFailure.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLockFailure.java
index 80b51202e..13d3345d1 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLockFailure.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLockFailure.java
@@ -18,8 +18,5 @@ public record RegistrationLockFailure(
     long timeRemaining,
     @Schema(description = "Credentials that can be used with SVR2")
     @Nullable
-    ExternalServiceCredentials svr2Credentials,
-    @Deprecated
-    @Nullable
-    ExternalServiceCredentials svr3Credentials) {
+    ExternalServiceCredentials svr2Credentials) {
 }