More Accounts cleanup

* Remove `AccountStore`
* Clean up `AccountsDynamoDb#delete`
* Rename `AccountsDynamoDb` → `Accounts`
* Remove unused configuration
* Move Accounts scan page size to static configuration
* Remove disabled tests and related methods

service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java

@@ -109,11 +109,6 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private AccountDatabaseCrawlerConfiguration accountDatabaseCrawler;
 
-  @NotNull
-  @Valid
-  @JsonProperty
-  private AccountDatabaseCrawlerConfiguration dynamoDbMigrationCrawler;
-
   @NotNull
   @Valid
   @JsonProperty
@@ -149,21 +144,6 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private AccountsDynamoDbConfiguration accountsDynamoDb;
 
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DynamoDbConfiguration migrationDeletedAccountsDynamoDb;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DynamoDbConfiguration migrationMismatchedAccountsDynamoDb;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DynamoDbConfiguration migrationRetryAccountsDynamoDb;
-
   @Valid
   @NotNull
   @JsonProperty
@@ -376,10 +356,6 @@ public class WhisperServerConfiguration extends Configuration {
     return accountDatabaseCrawler;
   }
 
-  public AccountDatabaseCrawlerConfiguration getDynamoDbMigrationCrawlerConfiguration() {
-    return dynamoDbMigrationCrawler;
-  }
-
   public MessageCacheConfiguration getMessageCacheConfiguration() {
     return messageCache;
   }
@@ -408,18 +384,6 @@ public class WhisperServerConfiguration extends Configuration {
     return accountsDynamoDb;
   }
 
-  public DynamoDbConfiguration getMigrationDeletedAccountsDynamoDbConfiguration() {
-    return migrationDeletedAccountsDynamoDb;
-  }
-
-  public DynamoDbConfiguration getMigrationMismatchedAccountsDynamoDbConfiguration() {
-    return migrationMismatchedAccountsDynamoDb;
-  }
-
-  public DynamoDbConfiguration getMigrationRetryAccountsDynamoDbConfiguration() {
-    return migrationRetryAccountsDynamoDb;
-  }
-
   public DeletedAccountsDynamoDbConfiguration getDeletedAccountsDynamoDbConfiguration() {
     return deletedAccountsDynamoDb;
   }

service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java

@@ -154,7 +154,7 @@ import org.whispersystems.textsecuregcm.storage.AccountCleaner;
 import org.whispersystems.textsecuregcm.storage.AccountDatabaseCrawler;
 import org.whispersystems.textsecuregcm.storage.AccountDatabaseCrawlerCache;
 import org.whispersystems.textsecuregcm.storage.AccountDatabaseCrawlerListener;
-import org.whispersystems.textsecuregcm.storage.AccountsDynamoDb;
+import org.whispersystems.textsecuregcm.storage.Accounts;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.ContactDiscoveryWriter;
 import org.whispersystems.textsecuregcm.storage.DeletedAccounts;
@@ -337,10 +337,10 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
         config.getDeletedAccountsDynamoDbConfiguration().getTableName(),
         config.getDeletedAccountsDynamoDbConfiguration().getNeedsReconciliationIndexName());
 
-    AccountsDynamoDb accountsDynamoDb = new AccountsDynamoDb(accountsDynamoDbClient,
+    Accounts accounts = new Accounts(accountsDynamoDbClient,
         config.getAccountsDynamoDbConfiguration().getTableName(),
-        config.getAccountsDynamoDbConfiguration().getPhoneNumberTableName()
-    );
+        config.getAccountsDynamoDbConfiguration().getPhoneNumberTableName(),
+        config.getAccountsDynamoDbConfiguration().getScanPageSize());
     Usernames usernames = new Usernames(accountDatabase);
     ReservedUsernames reservedUsernames = new ReservedUsernames(accountDatabase);
     Profiles profiles = new Profiles(accountDatabase);
@@ -424,10 +424,9 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     MessagesManager            messagesManager            = new MessagesManager(messagesDynamoDb, messagesCache, pushLatencyManager, reportMessageManager);
     DeletedAccountsManager deletedAccountsManager = new DeletedAccountsManager(deletedAccounts,
         deletedAccountsLockDynamoDbClient, config.getDeletedAccountsLockDynamoDbConfiguration().getTableName());
-    AccountsManager accountsManager = new AccountsManager(accountsDynamoDb, cacheCluster,
-        deletedAccountsManager, directoryQueue, keysDynamoDb, messagesManager, usernamesManager,
-        profilesManager, pendingAccountsManager, secureStorageClient, secureBackupClient,
-        dynamicConfigurationManager);
+    AccountsManager accountsManager = new AccountsManager(accounts, cacheCluster,
+        deletedAccountsManager, directoryQueue, keysDynamoDb, messagesManager, usernamesManager, profilesManager,
+        pendingAccountsManager, secureStorageClient, secureBackupClient);
     RemoteConfigsManager remoteConfigsManager = new RemoteConfigsManager(remoteConfigs);
     DeadLetterHandler          deadLetterHandler          = new DeadLetterHandler(accountsManager, messagesManager);
     DispatchManager            dispatchManager            = new DispatchManager(pubSubClientFactory, Optional.of(deadLetterHandler));

service/src/main/java/org/whispersystems/textsecuregcm/configuration/AccountsDynamoDbConfiguration.java

@@ -1,5 +1,6 @@
 package org.whispersystems.textsecuregcm.configuration;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import javax.validation.constraints.NotNull;
 
 public class AccountsDynamoDbConfiguration extends DynamoDbConfiguration {
@@ -7,7 +8,16 @@ public class AccountsDynamoDbConfiguration extends DynamoDbConfiguration {
   @NotNull
   private String phoneNumberTableName;
 
+  private int scanPageSize = 100;
+
+  @JsonProperty
   public String getPhoneNumberTableName() {
     return phoneNumberTableName;
   }
+
+  @JsonProperty
+  public int getScanPageSize() {
+    return scanPageSize;
+  }
+
 }

service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicAccountsDynamoDbMigrationConfiguration.java

@@ -1,15 +0,0 @@
-package org.whispersystems.textsecuregcm.configuration.dynamic;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class DynamicAccountsDynamoDbMigrationConfiguration {
-
-  @JsonProperty
-  int dynamoCrawlerScanPageSize = 10;
-
-  // TODO move out of "migration" configuration
-  public int getDynamoCrawlerScanPageSize() {
-    return dynamoCrawlerScanPageSize;
-  }
-
-}

service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfiguration.java

@@ -44,9 +44,6 @@ public class DynamicConfiguration {
   @JsonProperty
   private DynamicSignupCaptchaConfiguration signupCaptcha = new DynamicSignupCaptchaConfiguration();
 
-  @JsonProperty
-  private DynamicAccountsDynamoDbMigrationConfiguration accountsDynamoDbMigration = new DynamicAccountsDynamoDbMigrationConfiguration();
-
   @JsonProperty
   @Valid
   private DynamicRateLimitChallengeConfiguration rateLimitChallenge = new DynamicRateLimitChallengeConfiguration();
@@ -94,10 +91,6 @@ public class DynamicConfiguration {
     return signupCaptcha;
   }
 
-  public DynamicAccountsDynamoDbMigrationConfiguration getAccountsDynamoDbMigrationConfiguration() {
-    return accountsDynamoDbMigration;
-  }
-
   public DynamicRateLimitChallengeConfiguration getRateLimitChallengeConfiguration() {
     return rateLimitChallenge;
   }

service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawler.java

@@ -106,7 +106,7 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
         final long endTimeMs = System.currentTimeMillis();
         final long sleepIntervalMs = chunkIntervalMs - (endTimeMs - startTimeMs);
         if (sleepIntervalMs > 0) {
-          logger.info("Sleeping {}ms", sleepIntervalMs);
+          logger.debug("Sleeping {}ms", sleepIntervalMs);
           sleepWhileRunning(sleepIntervalMs);
         }
       } finally {
@@ -135,7 +135,7 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
         cacheLastUuid(Optional.empty());
         cache.setAccelerated(false);
       } else {
-        logger.info("Processing chunk");
+        logger.debug("Processing chunk");
         try {
           for (AccountDatabaseCrawlerListener listener : listeners) {
             listener.timeAndProcessCrawlChunk(fromUuid, chunkAccounts.getAccounts());

service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountStore.java

@@ -1,17 +0,0 @@
-package org.whispersystems.textsecuregcm.storage;
-
-import java.util.Optional;
-import java.util.UUID;
-
-public interface AccountStore {
-
-  boolean create(Account account);
-
-  void update(Account account) throws ContestedOptimisticLockException;
-
-  Optional<Account> get(String number);
-
-  Optional<Account> get(UUID uuid);
-
-  void delete(final UUID uuid);
-}

service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java

@@ -38,7 +38,7 @@ import software.amazon.awssdk.services.dynamodb.model.TransactionConflictExcepti
 import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
 import software.amazon.awssdk.services.dynamodb.model.UpdateItemResponse;
 
-public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountStore {
+public class Accounts extends AbstractDynamoDbStore {
 
   // uuid, primary key
   static final String KEY_ACCOUNT_UUID = "U";
@@ -56,25 +56,28 @@ public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountSt
   private final String phoneNumbersTableName;
   private final String accountsTableName;
 
-  private static final Timer CREATE_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "create"));
-  private static final Timer UPDATE_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "update"));
-  private static final Timer GET_BY_NUMBER_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "getByNumber"));
-  private static final Timer GET_BY_UUID_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "getByUuid"));
-  private static final Timer GET_ALL_FROM_START_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "getAllFrom"));
-  private static final Timer GET_ALL_FROM_OFFSET_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "getAllFromOffset"));
-  private static final Timer DELETE_TIMER = Metrics.timer(name(AccountsDynamoDb.class, "delete"));
+  private final int scanPageSize;
+
+  private static final Timer CREATE_TIMER = Metrics.timer(name(Accounts.class, "create"));
+  private static final Timer UPDATE_TIMER = Metrics.timer(name(Accounts.class, "update"));
+  private static final Timer GET_BY_NUMBER_TIMER = Metrics.timer(name(Accounts.class, "getByNumber"));
+  private static final Timer GET_BY_UUID_TIMER = Metrics.timer(name(Accounts.class, "getByUuid"));
+  private static final Timer GET_ALL_FROM_START_TIMER = Metrics.timer(name(Accounts.class, "getAllFrom"));
+  private static final Timer GET_ALL_FROM_OFFSET_TIMER = Metrics.timer(name(Accounts.class, "getAllFromOffset"));
+  private static final Timer DELETE_TIMER = Metrics.timer(name(Accounts.class, "delete"));
 
 
-  public AccountsDynamoDb(DynamoDbClient client, String accountsTableName, String phoneNumbersTableName) {
+  public Accounts(DynamoDbClient client, String accountsTableName, String phoneNumbersTableName,
+      final int scanPageSize) {
 
     super(client);
 
     this.client = client;
     this.phoneNumbersTableName = phoneNumbersTableName;
     this.accountsTableName = accountsTableName;
+    this.scanPageSize = scanPageSize;
   }
 
-  @Override
   public boolean create(Account account) {
     return CREATE_TIMER.record(() -> {
 
@@ -115,7 +118,7 @@ public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountSt
           }
 
           if ("TransactionConflict".equals(accountCancellationReason.code())) {
-            // this should only happen during concurrent update()s for an account  migration
+            // this should only happen if two clients manage to make concurrent create() calls
             throw new ContestedOptimisticLockException();
           }
 
@@ -164,7 +167,6 @@ public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountSt
         .build();
   }
 
-  @Override
   public void update(Account account) throws ContestedOptimisticLockException {
     UPDATE_TIMER.record(() -> {
       UpdateItemRequest updateItemRequest;
@@ -207,8 +209,6 @@ public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountSt
     });
   }
 
-
-  @Override
   public Optional<Account> get(String number) {
     return GET_BY_NUMBER_TIMER.record(() -> {
 
@@ -220,7 +220,7 @@ public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountSt
       return Optional.ofNullable(response.item())
           .map(item -> item.get(KEY_ACCOUNT_UUID))
           .map(uuid -> accountByUuid(uuid))
-          .map(AccountsDynamoDb::fromItem);
+          .map(Accounts::fromItem);
     });
   }
 
@@ -233,29 +233,52 @@ public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountSt
     return r.item().isEmpty() ? null : r.item();
   }
 
-  @Override
   public Optional<Account> get(UUID uuid) {
     return GET_BY_UUID_TIMER.record(() ->
         Optional.ofNullable(accountByUuid(AttributeValues.fromUUID(uuid)))
-            .map(AccountsDynamoDb::fromItem));
+            .map(Accounts::fromItem));
   }
 
-  @Override
   public void delete(UUID uuid) {
-    DELETE_TIMER.record(() -> delete(uuid, true));
+    DELETE_TIMER.record(() -> {
+
+      Optional<Account> maybeAccount = get(uuid);
+
+      maybeAccount.ifPresent(account -> {
+
+        TransactWriteItem phoneNumberDelete = TransactWriteItem.builder()
+            .delete(Delete.builder()
+                .tableName(phoneNumbersTableName)
+                .key(Map.of(ATTR_ACCOUNT_E164, AttributeValues.fromString(account.getNumber())))
+                .build())
+            .build();
+
+        TransactWriteItem accountDelete = TransactWriteItem.builder()
+            .delete(Delete.builder()
+                .tableName(accountsTableName)
+                .key(Map.of(KEY_ACCOUNT_UUID, AttributeValues.fromUUID(uuid)))
+                .build())
+            .build();
+
+        TransactWriteItemsRequest request = TransactWriteItemsRequest.builder()
+            .transactItems(phoneNumberDelete, accountDelete).build();
+
+        client.transactWriteItems(request);
+      });
+    });
   }
 
-  public AccountCrawlChunk getAllFrom(final UUID from, final int maxCount, final int pageSize) {
+  public AccountCrawlChunk getAllFrom(final UUID from, final int maxCount) {
     final ScanRequest.Builder scanRequestBuilder = ScanRequest.builder()
-        .limit(pageSize)
+        .limit(scanPageSize)
         .exclusiveStartKey(Map.of(KEY_ACCOUNT_UUID, AttributeValues.fromUUID(from)));
 
     return scanForChunk(scanRequestBuilder, maxCount, GET_ALL_FROM_OFFSET_TIMER);
   }
 
-  public AccountCrawlChunk getAllFromStart(final int maxCount, final int pageSize) {
+  public AccountCrawlChunk getAllFromStart(final int maxCount) {
     final ScanRequest.Builder scanRequestBuilder = ScanRequest.builder()
-        .limit(pageSize);
+        .limit(scanPageSize);
 
     return scanForChunk(scanRequestBuilder, maxCount, GET_ALL_FROM_START_TIMER);
   }
@@ -266,39 +289,12 @@ public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountSt
 
     final List<Account> accounts = timer.record(() -> scan(scanRequestBuilder.build(), maxCount)
         .stream()
-        .map(AccountsDynamoDb::fromItem)
+        .map(Accounts::fromItem)
         .collect(Collectors.toList()));
 
     return new AccountCrawlChunk(accounts, accounts.size() > 0 ? accounts.get(accounts.size() - 1).getUuid() : null);
   }
 
-  private void delete(UUID uuid, boolean saveInDeletedAccountsTable) {
-
-    Optional<Account> maybeAccount = get(uuid);
-
-    maybeAccount.ifPresent(account -> {
-
-      TransactWriteItem phoneNumberDelete = TransactWriteItem.builder()
-          .delete(Delete.builder()
-              .tableName(phoneNumbersTableName)
-              .key(Map.of(ATTR_ACCOUNT_E164, AttributeValues.fromString(account.getNumber())))
-              .build())
-          .build();
-
-      TransactWriteItem accountDelete = TransactWriteItem.builder()
-          .delete(Delete.builder()
-              .tableName(accountsTableName)
-              .key(Map.of(KEY_ACCOUNT_UUID, AttributeValues.fromUUID(uuid)))
-              .build())
-          .build();
-
-      TransactWriteItemsRequest request = TransactWriteItemsRequest.builder()
-          .transactItems(phoneNumberDelete, accountDelete).build();
-
-      client.transactWriteItems(request);
-    });
-  }
-
   private static String extractCancellationReasonCodes(final TransactionCanceledException exception) {
     return exception.cancellationReasons().stream()
         .map(CancellationReason::code)

service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java

@@ -18,15 +18,12 @@ import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tags;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.auth.AuthenticationCredentials;
@@ -65,7 +62,7 @@ public class AccountsManager {
 
   private final Logger logger = LoggerFactory.getLogger(AccountsManager.class);
 
-  private final AccountsDynamoDb          accountsDynamoDb;
+  private final Accounts accounts;
   private final FaultTolerantRedisCluster cacheCluster;
   private final DeletedAccountsManager deletedAccountsManager;
   private final DirectoryQueue            directoryQueue;
@@ -78,8 +75,6 @@ public class AccountsManager {
   private final SecureBackupClient        secureBackupClient;
   private final ObjectMapper              mapper;
 
-  private final DynamicConfigurationManager dynamicConfigurationManager;
-
   public enum DeletionReason {
     ADMIN_DELETED("admin"),
     EXPIRED      ("expired"),
@@ -92,7 +87,7 @@ public class AccountsManager {
     }
   }
 
-  public AccountsManager(AccountsDynamoDb accountsDynamoDb, FaultTolerantRedisCluster cacheCluster,
+  public AccountsManager(Accounts accounts, FaultTolerantRedisCluster cacheCluster,
       final DeletedAccountsManager deletedAccountsManager,
       final DirectoryQueue directoryQueue,
       final KeysDynamoDb keysDynamoDb, final MessagesManager messagesManager,
@@ -100,22 +95,20 @@ public class AccountsManager {
       final ProfilesManager profilesManager,
       final StoredVerificationCodeManager pendingAccounts,
       final SecureStorageClient secureStorageClient,
-      final SecureBackupClient secureBackupClient,
-      final DynamicConfigurationManager dynamicConfigurationManager) {
-    this.accountsDynamoDb = accountsDynamoDb;
-    this.cacheCluster        = cacheCluster;
+      final SecureBackupClient secureBackupClient) {
+    this.accounts = accounts;
+    this.cacheCluster = cacheCluster;
     this.deletedAccountsManager = deletedAccountsManager;
-    this.directoryQueue      = directoryQueue;
-    this.keysDynamoDb        = keysDynamoDb;
+    this.directoryQueue = directoryQueue;
+    this.keysDynamoDb = keysDynamoDb;
     this.messagesManager = messagesManager;
     this.usernamesManager = usernamesManager;
-    this.profilesManager     = profilesManager;
+    this.profilesManager = profilesManager;
     this.pendingAccounts = pendingAccounts;
     this.secureStorageClient = secureStorageClient;
     this.secureBackupClient  = secureBackupClient;
     this.mapper              = SystemMapper.getMapper();
 
-    this.dynamicConfigurationManager = dynamicConfigurationManager;
   }
 
   public Account create(final String number,
@@ -336,15 +329,11 @@ public class AccountsManager {
   }
 
   public AccountCrawlChunk getAllFromDynamo(int length) {
-    final int maxPageSize = dynamicConfigurationManager.getConfiguration().getAccountsDynamoDbMigrationConfiguration()
-        .getDynamoCrawlerScanPageSize();
-    return accountsDynamoDb.getAllFromStart(length, maxPageSize);
+    return accounts.getAllFromStart(length);
   }
 
   public AccountCrawlChunk getAllFromDynamo(UUID uuid, int length) {
-    final int maxPageSize = dynamicConfigurationManager.getConfiguration().getAccountsDynamoDbMigrationConfiguration()
-        .getDynamoCrawlerScanPageSize();
-    return accountsDynamoDb.getAllFrom(uuid, length, maxPageSize);
+    return accounts.getAllFrom(uuid, length);
   }
 
   public void delete(final Account account, final DeletionReason deletionReason) throws InterruptedException {
@@ -445,38 +434,23 @@ public class AccountsManager {
   }
 
   private Optional<Account> dynamoGet(String number) {
-    return accountsDynamoDb.get(number);
+    return accounts.get(number);
   }
 
   private Optional<Account> dynamoGet(UUID uuid) {
-    return accountsDynamoDb.get(uuid);
+    return accounts.get(uuid);
   }
 
   private boolean dynamoCreate(Account account) {
-    return accountsDynamoDb.create(account);
+    return accounts.create(account);
   }
 
   private void dynamoUpdate(Account account) {
-    accountsDynamoDb.update(account);
+    accounts.update(account);
   }
 
   private void dynamoDelete(final Account account) {
-    accountsDynamoDb.delete(account.getUuid());
+    accounts.delete(account.getUuid());
   }
 
-  // TODO delete
-  @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-  @Deprecated
-  public Optional<String> compareAccounts(final Optional<Account> maybePrimaryAccount,
-      final Optional<Account> maybeSecondaryAccount) {
-    return Optional.empty();
-  }
-
-  private String getAbbreviatedCallChain(final StackTraceElement[] stackTrace) {
-    return Arrays.stream(stackTrace)
-        .filter(stackTraceElement -> stackTraceElement.getClassName().contains("org.whispersystems"))
-        .filter(stackTraceElement -> !(stackTraceElement.getClassName().endsWith("AccountsManager") && stackTraceElement.getMethodName().contains("compare")))
-        .map(stackTraceElement -> StringUtils.substringAfterLast(stackTraceElement.getClassName(), ".") + ":" + stackTraceElement.getMethodName())
-        .collect(Collectors.joining(" -> "));
-  }
 }

service/src/main/java/org/whispersystems/textsecuregcm/workers/DeleteUserCommand.java

@@ -33,7 +33,7 @@ import org.whispersystems.textsecuregcm.securebackup.SecureBackupClient;
 import org.whispersystems.textsecuregcm.securestorage.SecureStorageClient;
 import org.whispersystems.textsecuregcm.sqs.DirectoryQueue;
 import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.AccountsDynamoDb;
+import org.whispersystems.textsecuregcm.storage.Accounts;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.AccountsManager.DeletionReason;
 import org.whispersystems.textsecuregcm.storage.DeletedAccounts;
@@ -150,9 +150,10 @@ public class DeleteUserCommand extends EnvironmentCommand<WhisperServerConfigura
       VerificationCodeStore pendingAccounts = new VerificationCodeStore(pendingAccountsDynamoDbClient,
           configuration.getPendingAccountsDynamoDbConfiguration().getTableName());
 
-      AccountsDynamoDb accountsDynamoDb = new AccountsDynamoDb(accountsDynamoDbClient,
+      Accounts accounts = new Accounts(accountsDynamoDbClient,
           configuration.getAccountsDynamoDbConfiguration().getTableName(),
-          configuration.getAccountsDynamoDbConfiguration().getPhoneNumberTableName());
+          configuration.getAccountsDynamoDbConfiguration().getPhoneNumberTableName(),
+          configuration.getAccountsDynamoDbConfiguration().getScanPageSize());
       Usernames usernames = new Usernames(accountDatabase);
       Profiles profiles = new Profiles(accountDatabase);
       ReservedUsernames reservedUsernames = new ReservedUsernames(accountDatabase);
@@ -188,10 +189,9 @@ public class DeleteUserCommand extends EnvironmentCommand<WhisperServerConfigura
           deletedAccountsLockDynamoDbClient,
           configuration.getDeletedAccountsLockDynamoDbConfiguration().getTableName());
       StoredVerificationCodeManager pendingAccountsManager = new StoredVerificationCodeManager(pendingAccounts);
-      AccountsManager accountsManager = new AccountsManager(accountsDynamoDb, cacheCluster,
-          deletedAccountsManager, directoryQueue, keysDynamoDb, messagesManager, usernamesManager,
-          profilesManager, pendingAccountsManager, secureStorageClient, secureBackupClient,
-          dynamicConfigurationManager);
+      AccountsManager accountsManager = new AccountsManager(accounts, cacheCluster,
+          deletedAccountsManager, directoryQueue, keysDynamoDb, messagesManager, usernamesManager, profilesManager,
+          pendingAccountsManager, secureStorageClient, secureBackupClient);
 
       for (String user : users) {
         Optional<Account> account = accountsManager.get(user);

service/src/main/java/org/whispersystems/textsecuregcm/workers/SetUserDiscoverabilityCommand.java

@@ -32,7 +32,7 @@ import org.whispersystems.textsecuregcm.securebackup.SecureBackupClient;
 import org.whispersystems.textsecuregcm.securestorage.SecureStorageClient;
 import org.whispersystems.textsecuregcm.sqs.DirectoryQueue;
 import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.AccountsDynamoDb;
+import org.whispersystems.textsecuregcm.storage.Accounts;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.DeletedAccounts;
 import org.whispersystems.textsecuregcm.storage.DeletedAccountsManager;
@@ -153,10 +153,10 @@ public class SetUserDiscoverabilityCommand extends EnvironmentCommand<WhisperSer
       VerificationCodeStore pendingAccounts = new VerificationCodeStore(pendingAccountsDynamoDbClient,
           configuration.getPendingAccountsDynamoDbConfiguration().getTableName());
 
-      AccountsDynamoDb accountsDynamoDb = new AccountsDynamoDb(accountsDynamoDbClient,
+      Accounts accounts = new Accounts(accountsDynamoDbClient,
           configuration.getAccountsDynamoDbConfiguration().getTableName(),
-          configuration.getAccountsDynamoDbConfiguration().getPhoneNumberTableName()
-      );
+          configuration.getAccountsDynamoDbConfiguration().getPhoneNumberTableName(),
+          configuration.getAccountsDynamoDbConfiguration().getScanPageSize());
       Usernames usernames = new Usernames(accountDatabase);
       Profiles profiles = new Profiles(accountDatabase);
       ReservedUsernames reservedUsernames = new ReservedUsernames(accountDatabase);
@@ -192,11 +192,9 @@ public class SetUserDiscoverabilityCommand extends EnvironmentCommand<WhisperSer
           deletedAccountsLockDynamoDbClient,
           configuration.getDeletedAccountsLockDynamoDbConfiguration().getTableName());
       StoredVerificationCodeManager pendingAccountsManager = new StoredVerificationCodeManager(pendingAccounts);
-      AccountsManager accountsManager = new AccountsManager(accountsDynamoDb, cacheCluster,
-          deletedAccountsManager, directoryQueue, keysDynamoDb, messagesManager, usernamesManager,
-          profilesManager,
-          pendingAccountsManager, secureStorageClient, secureBackupClient,
-          dynamicConfigurationManager);
+      AccountsManager accountsManager = new AccountsManager(accounts, cacheCluster,
+          deletedAccountsManager, directoryQueue, keysDynamoDb, messagesManager, usernamesManager, profilesManager,
+          pendingAccountsManager, secureStorageClient, secureBackupClient);
 
       Optional<Account> maybeAccount;