From 30ae2037e8ad2772207f5545802661a6f7b85e07 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Fri, 30 Jun 2023 12:05:16 -0400
Subject: [PATCH] Correct order of constructor arguments for `KeysManager`

---
 .../org/whispersystems/textsecuregcm/WhisperServerService.java  | 2 +-
 .../textsecuregcm/workers/AssignUsernameCommand.java            | 2 +-
 .../textsecuregcm/workers/CommandDependencies.java              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index fd0177b00..797fbeb56 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -318,8 +318,8 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     KeysManager keys = new KeysManager(
             dynamoDbAsyncClient,
         config.getDynamoDbTables().getEcKeys().getTableName(),
-        config.getDynamoDbTables().getEcSignedPreKeys().getTableName(),
         config.getDynamoDbTables().getKemKeys().getTableName(),
+        config.getDynamoDbTables().getEcSignedPreKeys().getTableName(),
         config.getDynamoDbTables().getKemLastResortKeys().getTableName(),
         dynamicConfigurationManager);
     MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(dynamoDbClient, dynamoDbAsyncClient,
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/AssignUsernameCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/AssignUsernameCommand.java
index 06829405e..a909c5b8a 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/AssignUsernameCommand.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/AssignUsernameCommand.java
@@ -165,8 +165,8 @@ public class AssignUsernameCommand extends EnvironmentCommand<WhisperServerConfi
     KeysManager keys = new KeysManager(
             dynamoDbAsyncClient,
         configuration.getDynamoDbTables().getEcKeys().getTableName(),
-        configuration.getDynamoDbTables().getEcSignedPreKeys().getTableName(),
         configuration.getDynamoDbTables().getKemKeys().getTableName(),
+        configuration.getDynamoDbTables().getEcSignedPreKeys().getTableName(),
         configuration.getDynamoDbTables().getKemLastResortKeys().getTableName(),
         dynamicConfigurationManager);
     MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(dynamoDbClient, dynamoDbAsyncClient,
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java
index aabec8ffa..53658b841 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java
@@ -149,8 +149,8 @@ record CommandDependencies(
     KeysManager keys = new KeysManager(
             dynamoDbAsyncClient,
         configuration.getDynamoDbTables().getEcKeys().getTableName(),
-        configuration.getDynamoDbTables().getEcSignedPreKeys().getTableName(),
         configuration.getDynamoDbTables().getKemKeys().getTableName(),
+        configuration.getDynamoDbTables().getEcSignedPreKeys().getTableName(),
         configuration.getDynamoDbTables().getKemLastResortKeys().getTableName(),
         dynamicConfigurationManager);
     MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(dynamoDbClient, dynamoDbAsyncClient,