Retire the legacy client presence system

2026-04-21 01:48:03 +01:00 · 2024-11-05 12:34:27 -05:00
parent 9898e18ae2
commit 1c167ec150
27 changed files with 40 additions and 1034 deletions
--- a/service/src/test/java/org/whispersystems/textsecuregcm/auth/LinkedDeviceRefreshRequirementProviderTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/auth/LinkedDeviceRefreshRequirementProviderTest.java
@@ -59,7 +59,6 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentCaptor;
 import org.whispersystems.textsecuregcm.filters.RemoteAddressFilter;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.PubSubClientEventManager;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
@@ -96,7 +95,6 @@ class LinkedDeviceRefreshRequirementProviderTest {
      .build();

  private AccountsManager accountsManager;
-  private ClientPresenceManager clientPresenceManager;
  private PubSubClientEventManager pubSubClientEventManager;

  private LinkedDeviceRefreshRequirementProvider provider;
@@ -104,13 +102,12 @@ class LinkedDeviceRefreshRequirementProviderTest {
  @BeforeEach
  void setup() {
    accountsManager = mock(AccountsManager.class);
-    clientPresenceManager = mock(ClientPresenceManager.class);
    pubSubClientEventManager = mock(PubSubClientEventManager.class);

    provider = new LinkedDeviceRefreshRequirementProvider(accountsManager);

    final WebsocketRefreshRequestEventListener listener =
-        new WebsocketRefreshRequestEventListener(clientPresenceManager, pubSubClientEventManager, provider);
+        new WebsocketRefreshRequestEventListener(pubSubClientEventManager, provider);

    when(applicationEventListener.onRequest(any())).thenReturn(listener);

@@ -121,9 +118,6 @@ class LinkedDeviceRefreshRequirementProviderTest {
        .forEach(deviceId -> account.addDevice(DevicesHelper.createDevice((byte) deviceId)));

    when(accountsManager.getByAccountIdentifier(uuid)).thenReturn(Optional.of(account));
-
-    account.getDevices()
-        .forEach(device -> when(clientPresenceManager.isPresent(uuid, device.getId())).thenReturn(true));
  }

  @Test
@@ -145,10 +139,6 @@ class LinkedDeviceRefreshRequirementProviderTest {

    assertEquals(initialDeviceCount + addedDeviceNames.size(), account.getDevices().size());

-    verify(clientPresenceManager).disconnectPresence(account.getUuid(), (byte) 1);
-    verify(clientPresenceManager).disconnectPresence(account.getUuid(), (byte) 2);
-    verify(clientPresenceManager).disconnectPresence(account.getUuid(), (byte) 3);
-
    verify(pubSubClientEventManager).requestDisconnection(account.getUuid(), List.of((byte) 1));
    verify(pubSubClientEventManager).requestDisconnection(account.getUuid(), List.of((byte) 2));
    verify(pubSubClientEventManager).requestDisconnection(account.getUuid(), List.of((byte) 3));
@@ -180,11 +170,10 @@ class LinkedDeviceRefreshRequirementProviderTest {
    assertEquals(200, response.getStatus());

    initialDeviceIds.forEach(deviceId -> {
-      verify(clientPresenceManager).disconnectPresence(account.getUuid(), deviceId);
      verify(pubSubClientEventManager).requestDisconnection(account.getUuid(), List.of(deviceId));
    });

-    verifyNoMoreInteractions(clientPresenceManager);
+    verifyNoMoreInteractions(pubSubClientEventManager);
  }

  @Test
--- a/service/src/test/java/org/whispersystems/textsecuregcm/auth/PhoneNumberChangeRefreshRequirementProviderTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/auth/PhoneNumberChangeRefreshRequirementProviderTest.java
@@ -47,7 +47,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.whispersystems.textsecuregcm.filters.RemoteAddressFilter;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.PubSubClientEventManager;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
@@ -75,7 +74,6 @@ class PhoneNumberChangeRefreshRequirementProviderTest {

  private static final AccountAuthenticator AUTHENTICATOR = mock(AccountAuthenticator.class);
  private static final AccountsManager ACCOUNTS_MANAGER = mock(AccountsManager.class);
-  private static final ClientPresenceManager CLIENT_PRESENCE = mock(ClientPresenceManager.class);
  private static final PubSubClientEventManager PUBSUB_CLIENT_PRESENCE = mock(PubSubClientEventManager.class);

  private WebSocketClient client;
@@ -86,7 +84,7 @@ class PhoneNumberChangeRefreshRequirementProviderTest {

  @BeforeEach
  void setUp() throws Exception {
-    reset(AUTHENTICATOR, CLIENT_PRESENCE, ACCOUNTS_MANAGER);
+    reset(AUTHENTICATOR, ACCOUNTS_MANAGER, PUBSUB_CLIENT_PRESENCE);
    client = new WebSocketClient();
    client.start();

@@ -125,9 +123,9 @@ class PhoneNumberChangeRefreshRequirementProviderTest {
          .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), false, "/*");
      webSocketEnvironment.jersey().register(new RemoteAddressFilter());
      webSocketEnvironment.jersey()
-          .register(new WebsocketRefreshApplicationEventListener(ACCOUNTS_MANAGER, CLIENT_PRESENCE, PUBSUB_CLIENT_PRESENCE));
+          .register(new WebsocketRefreshApplicationEventListener(ACCOUNTS_MANAGER, PUBSUB_CLIENT_PRESENCE));
      environment.jersey()
-          .register(new WebsocketRefreshApplicationEventListener(ACCOUNTS_MANAGER, CLIENT_PRESENCE, PUBSUB_CLIENT_PRESENCE));
+          .register(new WebsocketRefreshApplicationEventListener(ACCOUNTS_MANAGER, PUBSUB_CLIENT_PRESENCE));
      webSocketEnvironment.setConnectListener(webSocketSessionContext -> {
      });

@@ -201,7 +199,7 @@ class PhoneNumberChangeRefreshRequirementProviderTest {

    // Event listeners can fire after responses are sent
    verify(ACCOUNTS_MANAGER, timeout(5000).times(1)).getByAccountIdentifier(eq(account1.getUuid()));
-    verifyNoMoreInteractions(CLIENT_PRESENCE);
+    verifyNoMoreInteractions(PUBSUB_CLIENT_PRESENCE);
    verifyNoMoreInteractions(ACCOUNTS_MANAGER);
  }

@@ -215,10 +213,6 @@ class PhoneNumberChangeRefreshRequirementProviderTest {

    // Make sure we disconnect the account if the account has changed numbers. Event listeners can fire after responses
    // are sent, so use a timeout.
-    verify(CLIENT_PRESENCE, timeout(5000))
-        .disconnectPresence(eq(account1.getUuid()), eq(authenticatedDevice.getId()));
-    verifyNoMoreInteractions(CLIENT_PRESENCE);
-
    verify(PUBSUB_CLIENT_PRESENCE, timeout(5000))
        .requestDisconnection(account1.getUuid(), List.of(authenticatedDevice.getId()));
    verifyNoMoreInteractions(PUBSUB_CLIENT_PRESENCE);
@@ -235,10 +229,6 @@ class PhoneNumberChangeRefreshRequirementProviderTest {

    // Make sure we disconnect the account if the account has changed numbers. Event listeners can fire after responses
    // are sent, so use a timeout.
-    verify(CLIENT_PRESENCE, timeout(5000))
-        .disconnectPresence(eq(account1.getUuid()), eq(authenticatedDevice.getId()));
-    verifyNoMoreInteractions(CLIENT_PRESENCE);
-
    verify(PUBSUB_CLIENT_PRESENCE, timeout(5000))
        .requestDisconnection(account1.getUuid(), List.of(authenticatedDevice.getId()));
    verifyNoMoreInteractions(PUBSUB_CLIENT_PRESENCE);
@@ -255,7 +245,6 @@ class PhoneNumberChangeRefreshRequirementProviderTest {

    // Shouldn't even read the account if the method has not been annotated
    verifyNoMoreInteractions(ACCOUNTS_MANAGER);
-    verifyNoMoreInteractions(CLIENT_PRESENCE);
  }

  @ParameterizedTest
@@ -269,7 +258,6 @@ class PhoneNumberChangeRefreshRequirementProviderTest {

    // Shouldn't even read the account if the method has not been annotated
    verifyNoMoreInteractions(ACCOUNTS_MANAGER);
-    verifyNoMoreInteractions(CLIENT_PRESENCE);
  }


--- a/service/src/test/java/org/whispersystems/textsecuregcm/auth/RegistrationLockVerificationManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/auth/RegistrationLockVerificationManagerTest.java
@@ -33,7 +33,6 @@ import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
 import org.whispersystems.textsecuregcm.entities.PhoneVerificationRequest;
 import org.whispersystems.textsecuregcm.limits.RateLimiter;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.NotPushRegisteredException;
 import org.whispersystems.textsecuregcm.push.PubSubClientEventManager;
 import org.whispersystems.textsecuregcm.push.PushNotificationManager;
@@ -47,7 +46,6 @@ import org.whispersystems.textsecuregcm.util.Pair;
 class RegistrationLockVerificationManagerTest {

  private final AccountsManager accountsManager = mock(AccountsManager.class);
-  private final ClientPresenceManager clientPresenceManager = mock(ClientPresenceManager.class);
  private final PubSubClientEventManager pubSubClientEventManager = mock(PubSubClientEventManager.class);
  private final ExternalServiceCredentialsGenerator svr2CredentialsGenerator = mock(
      ExternalServiceCredentialsGenerator.class);
@@ -58,7 +56,7 @@ class RegistrationLockVerificationManagerTest {
  private static PushNotificationManager pushNotificationManager = mock(PushNotificationManager.class);
  private final RateLimiters rateLimiters = mock(RateLimiters.class);
  private final RegistrationLockVerificationManager registrationLockVerificationManager = new RegistrationLockVerificationManager(
-      accountsManager, clientPresenceManager, pubSubClientEventManager, svr2CredentialsGenerator, svr3CredentialsGenerator,
+      accountsManager, pubSubClientEventManager, svr2CredentialsGenerator, svr3CredentialsGenerator,
      registrationRecoveryPasswordsManager, pushNotificationManager, rateLimiters);

  private final RateLimiter pinLimiter = mock(RateLimiter.class);
@@ -109,7 +107,6 @@ class RegistrationLockVerificationManagerTest {
            } else {
              verify(registrationRecoveryPasswordsManager, never()).removeForNumber(account.getNumber());
            }
-            verify(clientPresenceManager).disconnectAllPresences(account.getUuid(), List.of(Device.PRIMARY_ID));
            verify(pubSubClientEventManager).requestDisconnection(account.getUuid(), List.of(Device.PRIMARY_ID));
            try {
              verify(pushNotificationManager).sendAttemptLoginNotification(any(), eq("failedRegistrationLock"));
@@ -133,7 +130,6 @@ class RegistrationLockVerificationManagerTest {
            verify(pushNotificationManager, never()).sendAttemptLoginNotification(any(), eq("failedRegistrationLock"));
          } catch (NotPushRegisteredException npre) {}
          verify(registrationRecoveryPasswordsManager, never()).removeForNumber(account.getNumber());
-          verify(clientPresenceManager, never()).disconnectAllPresences(account.getUuid(), List.of(Device.PRIMARY_ID));
          verify(pubSubClientEventManager, never()).requestDisconnection(any(), any());
        });
      }
@@ -172,7 +168,6 @@ class RegistrationLockVerificationManagerTest {

    verify(account, never()).lockAuthTokenHash();
    verify(registrationRecoveryPasswordsManager, never()).removeForNumber(account.getNumber());
-    verify(clientPresenceManager, never()).disconnectAllPresences(account.getUuid(), List.of(Device.PRIMARY_ID));
    verify(pubSubClientEventManager, never()).requestDisconnection(any(), any());
  }

--- a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DeviceControllerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DeviceControllerTest.java
@@ -79,7 +79,6 @@ import org.whispersystems.textsecuregcm.limits.RateLimiter;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.mappers.DeviceLimitExceededExceptionMapper;
 import org.whispersystems.textsecuregcm.mappers.RateLimitExceededExceptionMapper;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.PubSubClientEventManager;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
@@ -111,7 +110,6 @@ class DeviceControllerTest {
  private static final Account account = mock(Account.class);
  private static final Account maxedAccount = mock(Account.class);
  private static final Device primaryDevice = mock(Device.class);
-  private static final ClientPresenceManager clientPresenceManager = mock(ClientPresenceManager.class);
  private static final PubSubClientEventManager pubSubClientEventManager = mock(PubSubClientEventManager.class);
  private static final Map<String, Integer> deviceConfiguration = new HashMap<>();
  private static final TestClock testClock = TestClock.now();
@@ -133,8 +131,7 @@ class DeviceControllerTest {
      .addProvider(new AuthValueFactoryProvider.Binder<>(AuthenticatedDevice.class))
      .addProvider(new RateLimitExceededExceptionMapper())
      .setTestContainerFactory(new GrizzlyWebTestContainerFactory())
-      .addProvider(new WebsocketRefreshApplicationEventListener(accountsManager, clientPresenceManager,
-          pubSubClientEventManager))
+      .addProvider(new WebsocketRefreshApplicationEventListener(accountsManager, pubSubClientEventManager))
      .addProvider(new DeviceLimitExceededExceptionMapper())
      .addResource(deviceController)
      .build();
@@ -174,8 +171,7 @@ class DeviceControllerTest {
        asyncCommands,
        account,
        maxedAccount,
-        primaryDevice,
-        clientPresenceManager
+        primaryDevice
    );

    testClock.unpin();
--- a/service/src/test/java/org/whispersystems/textsecuregcm/push/ClientPresenceManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/push/ClientPresenceManagerTest.java
@@ -1,413 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.push;
-
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.Mockito.mock;
-
-import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
-import io.lettuce.core.cluster.event.ClusterTopologyChangedEvent;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.RepeatedTest;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
-
-@Timeout(value = 10, threadMode = Timeout.ThreadMode.SEPARATE_THREAD)
-class ClientPresenceManagerTest {
-
-  @RegisterExtension
-  static final RedisClusterExtension REDIS_CLUSTER_EXTENSION = RedisClusterExtension.builder().build();
-
-  private ScheduledExecutorService presenceRenewalExecutorService;
-  private ClientPresenceManager clientPresenceManager;
-
-  private static final DisplacedPresenceListener NO_OP = connectedElsewhere -> {
-  };
-
-  private boolean expectExceptionOnClientPresenceManagerStop = false;
-
-  @BeforeEach
-  void setUp() throws Exception {
-
-    REDIS_CLUSTER_EXTENSION.getRedisCluster().useCluster(connection -> {
-      connection.sync().flushall();
-      connection.sync().upstream().commands().configSet("notify-keyspace-events", "K$glz");
-    });
-
-    presenceRenewalExecutorService = Executors.newSingleThreadScheduledExecutor();
-    clientPresenceManager = new ClientPresenceManager(REDIS_CLUSTER_EXTENSION.getRedisCluster(),
-        presenceRenewalExecutorService,
-        presenceRenewalExecutorService);
-  }
-
-  @AfterEach
-  public void tearDown() throws Exception {
-    presenceRenewalExecutorService.shutdown();
-    presenceRenewalExecutorService.awaitTermination(1, TimeUnit.MINUTES);
-
-    try {
-      clientPresenceManager.stop();
-    } catch (final Exception e) {
-      if (!expectExceptionOnClientPresenceManagerStop) {
-        throw e;
-      }
-    }
-  }
-
-  @Test
-  void testIsPresent() {
-    final UUID accountUuid = UUID.randomUUID();
-    final byte deviceId = 1;
-
-    assertFalse(clientPresenceManager.isPresent(accountUuid, deviceId));
-
-    clientPresenceManager.setPresent(accountUuid, deviceId, NO_OP);
-    assertTrue(clientPresenceManager.isPresent(accountUuid, deviceId));
-  }
-
-  @Test
-  void testIsLocallyPresent() {
-    final UUID accountUuid = UUID.randomUUID();
-    final byte deviceId = 1;
-
-    assertFalse(clientPresenceManager.isLocallyPresent(accountUuid, deviceId));
-
-    clientPresenceManager.setPresent(accountUuid, deviceId, NO_OP);
-    REDIS_CLUSTER_EXTENSION.getRedisCluster().useCluster(connection -> connection.sync().flushall());
-
-    assertTrue(clientPresenceManager.isLocallyPresent(accountUuid, deviceId));
-  }
-
-  @Test
-  void testLocalDisplacement() {
-    final UUID accountUuid = UUID.randomUUID();
-    final byte deviceId = 1;
-
-    final AtomicInteger displacementCounter = new AtomicInteger(0);
-    final DisplacedPresenceListener displacementListener = connectedElsewhere -> displacementCounter.incrementAndGet();
-
-    clientPresenceManager.setPresent(accountUuid, deviceId, displacementListener);
-
-    assertEquals(0, displacementCounter.get());
-
-    clientPresenceManager.setPresent(accountUuid, deviceId, displacementListener);
-
-    assertEquals(1, displacementCounter.get());
-  }
-
-  @Test
-  void testRemoteDisplacement() {
-    final UUID accountUuid = UUID.randomUUID();
-    final byte deviceId = 1;
-
-    final CompletableFuture<?> displaced = new CompletableFuture<>();
-
-    clientPresenceManager.start();
-
-    clientPresenceManager.setPresent(accountUuid, deviceId, connectedElsewhere -> displaced.complete(null));
-
-    REDIS_CLUSTER_EXTENSION.getRedisCluster().useCluster(
-        connection -> connection.sync().set(ClientPresenceManager.getPresenceKey(accountUuid, deviceId),
-            UUID.randomUUID().toString()));
-
-    displaced.join();
-  }
-
-  @Test
-  void testRemoteDisplacementAfterTopologyChange() {
-    final UUID accountUuid = UUID.randomUUID();
-    final byte deviceId = 1;
-
-    final CompletableFuture<?> displaced = new CompletableFuture<>();
-
-    clientPresenceManager.start();
-
-    clientPresenceManager.setPresent(accountUuid, deviceId, connectedElsewhere -> displaced.complete(null));
-
-    clientPresenceManager.getPubSubConnection()
-        .usePubSubConnection(connection -> connection.getResources().eventBus()
-            .publish(new ClusterTopologyChangedEvent(List.of(), List.of())));
-
-    REDIS_CLUSTER_EXTENSION.getRedisCluster().useCluster(
-        connection -> connection.sync().set(ClientPresenceManager.getPresenceKey(accountUuid, deviceId),
-            UUID.randomUUID().toString()));
-
-    displaced.join();
-  }
-
-  @Test
-  void testClearPresence() {
-    final UUID accountUuid = UUID.randomUUID();
-    final byte deviceId = 1;
-
-    assertFalse(clientPresenceManager.isPresent(accountUuid, deviceId));
-
-    clientPresenceManager.setPresent(accountUuid, deviceId, NO_OP);
-    assertFalse(clientPresenceManager.clearPresence(accountUuid, deviceId,
-        ignored -> fail("this listener should never be called")));
-    assertTrue(clientPresenceManager.clearPresence(accountUuid, deviceId, NO_OP));
-
-    clientPresenceManager.setPresent(accountUuid, deviceId, NO_OP);
-    REDIS_CLUSTER_EXTENSION.getRedisCluster().useCluster(
-        connection -> connection.sync().set(ClientPresenceManager.getPresenceKey(accountUuid, deviceId),
-            UUID.randomUUID().toString()));
-
-    assertFalse(clientPresenceManager.clearPresence(accountUuid, deviceId, NO_OP));
-  }
-
-  @Test
-  void testPruneMissingPeers() {
-    final String presentPeerId = UUID.randomUUID().toString();
-    final String missingPeerId = UUID.randomUUID().toString();
-
-    REDIS_CLUSTER_EXTENSION.getRedisCluster().useCluster(connection -> {
-      connection.sync().sadd(ClientPresenceManager.MANAGER_SET_KEY, presentPeerId);
-      connection.sync().sadd(ClientPresenceManager.MANAGER_SET_KEY, missingPeerId);
-    });
-
-    for (int i = 0; i < 10; i++) {
-      addClientPresence(presentPeerId);
-      addClientPresence(missingPeerId);
-    }
-
-    clientPresenceManager.getPubSubConnection().usePubSubConnection(
-        connection -> connection.sync().upstream().commands()
-            .subscribe(ClientPresenceManager.getManagerPresenceChannel(presentPeerId)));
-    clientPresenceManager.pruneMissingPeers();
-
-    assertEquals(1, (long) REDIS_CLUSTER_EXTENSION.getRedisCluster().withCluster(
-        connection -> connection.sync().exists(ClientPresenceManager.getConnectedClientSetKey(presentPeerId))));
-    assertTrue(REDIS_CLUSTER_EXTENSION.getRedisCluster().withCluster(
-        (Function<StatefulRedisClusterConnection<String, String>, Boolean>) connection -> connection.sync()
-            .sismember(ClientPresenceManager.MANAGER_SET_KEY, presentPeerId)));
-
-    assertEquals(0, (long) REDIS_CLUSTER_EXTENSION.getRedisCluster().withCluster(
-        connection -> connection.sync().exists(ClientPresenceManager.getConnectedClientSetKey(missingPeerId))));
-    assertFalse(REDIS_CLUSTER_EXTENSION.getRedisCluster().withCluster(
-        (Function<StatefulRedisClusterConnection<String, String>, Boolean>) connection -> connection.sync()
-            .sismember(ClientPresenceManager.MANAGER_SET_KEY, missingPeerId)));
-  }
-
-  @Test
-  void testInitialPresenceExpiration() {
-    final UUID accountUuid = UUID.randomUUID();
-    final byte deviceId = 1;
-
-    clientPresenceManager.setPresent(accountUuid, deviceId, NO_OP);
-
-    {
-      final int ttl = REDIS_CLUSTER_EXTENSION.getRedisCluster().withCluster(connection ->
-          connection.sync().ttl(ClientPresenceManager.getPresenceKey(accountUuid, deviceId)).intValue());
-
-      assertTrue(ttl > 0);
-    }
-  }
-
-  @Test
-  void testRenewPresence() {
-    final UUID accountUuid = UUID.randomUUID();
-    final byte deviceId = 1;
-
-    final String presenceKey = ClientPresenceManager.getPresenceKey(accountUuid, deviceId);
-
-    REDIS_CLUSTER_EXTENSION.getRedisCluster().useCluster(connection ->
-        connection.sync().set(presenceKey, clientPresenceManager.getManagerId()));
-
-    {
-      final int ttl = REDIS_CLUSTER_EXTENSION.getRedisCluster().withCluster(connection ->
-          connection.sync().ttl(presenceKey).intValue());
-
-      assertEquals(-1, ttl);
-    }
-
-    clientPresenceManager.renewPresence(accountUuid, deviceId);
-
-    {
-      final int ttl = REDIS_CLUSTER_EXTENSION.getRedisCluster().withCluster(connection ->
-          connection.sync().ttl(presenceKey).intValue());
-
-      assertTrue(ttl > 0);
-    }
-  }
-
-  @Test
-  void testExpiredPresence() {
-    final UUID accountUuid = UUID.randomUUID();
-    final byte deviceId = 1;
-
-    clientPresenceManager.setPresent(accountUuid, deviceId, NO_OP);
-
-    assertTrue(clientPresenceManager.isPresent(accountUuid, deviceId));
-
-    // Hackily set this key to expire immediately
-    REDIS_CLUSTER_EXTENSION.getRedisCluster().useCluster(connection ->
-        connection.sync().expire(ClientPresenceManager.getPresenceKey(accountUuid, deviceId), 0));
-
-    assertFalse(clientPresenceManager.isPresent(accountUuid, deviceId));
-  }
-
-  private void addClientPresence(final String managerId) {
-    final String clientPresenceKey = ClientPresenceManager.getPresenceKey(UUID.randomUUID(), (byte) 7);
-
-    REDIS_CLUSTER_EXTENSION.getRedisCluster().useCluster(connection -> {
-      connection.sync().set(clientPresenceKey, managerId);
-      connection.sync().sadd(ClientPresenceManager.getConnectedClientSetKey(managerId), clientPresenceKey);
-    });
-  }
-
-  @Test
-  void testClearAllOnStop() {
-    final int localAccounts = 10;
-    final UUID[] localUuids = new UUID[localAccounts];
-    final byte[] localDeviceIds = new byte[localAccounts];
-
-    for (int i = 0; i < localAccounts; i++) {
-      localUuids[i] = UUID.randomUUID();
-      localDeviceIds[i] = (byte) i;
-
-      clientPresenceManager.setPresent(localUuids[i], localDeviceIds[i], NO_OP);
-    }
-
-    final UUID displacedAccountUuid = UUID.randomUUID();
-    final byte displacedAccountDeviceId = 7;
-
-    clientPresenceManager.setPresent(displacedAccountUuid, displacedAccountDeviceId, NO_OP);
-    REDIS_CLUSTER_EXTENSION.getRedisCluster().useCluster(connection -> connection.sync()
-        .set(ClientPresenceManager.getPresenceKey(displacedAccountUuid, displacedAccountDeviceId),
-            UUID.randomUUID().toString()));
-
-    clientPresenceManager.stop();
-
-    for (int i = 0; i < localAccounts; i++) {
-      localUuids[i] = UUID.randomUUID();
-      localDeviceIds[i] = (byte) i;
-
-      assertFalse(clientPresenceManager.isPresent(localUuids[i], localDeviceIds[i]));
-    }
-
-    assertTrue(clientPresenceManager.isPresent(displacedAccountUuid, displacedAccountDeviceId));
-
-    expectExceptionOnClientPresenceManagerStop = true;
-  }
-
-  @Nested
-  class MultiServerTest {
-
-    private ClientPresenceManager server1;
-    private ClientPresenceManager server2;
-
-    @BeforeEach
-    void setup() throws Exception {
-
-      REDIS_CLUSTER_EXTENSION.getRedisCluster().useCluster(connection -> {
-        connection.sync().flushall();
-        connection.sync().upstream().commands().configSet("notify-keyspace-events", "K$glz");
-      });
-
-      final ScheduledExecutorService scheduledExecutorService1 = mock(ScheduledExecutorService.class);
-      final ExecutorService keyspaceNotificationExecutorService1 = Executors.newSingleThreadExecutor();
-      server1 = new ClientPresenceManager(REDIS_CLUSTER_EXTENSION.getRedisCluster(),
-          scheduledExecutorService1, keyspaceNotificationExecutorService1);
-
-      final ScheduledExecutorService scheduledExecutorService2 = mock(ScheduledExecutorService.class);
-      final ExecutorService keyspaceNotificationExecutorService2 = Executors.newSingleThreadExecutor();
-      server2 = new ClientPresenceManager(REDIS_CLUSTER_EXTENSION.getRedisCluster(),
-          scheduledExecutorService2, keyspaceNotificationExecutorService2);
-
-      server1.start();
-      server2.start();
-    }
-
-    @AfterEach
-    void teardown() {
-      server2.stop();
-      server1.stop();
-    }
-
-    @Test
-    void testSetPresentRemotely() {
-      final UUID uuid1 = UUID.randomUUID();
-      final byte deviceId = 1;
-
-      final CompletableFuture<?> displaced = new CompletableFuture<>();
-      final DisplacedPresenceListener listener1 = connectedElsewhere -> displaced.complete(null);
-      server1.setPresent(uuid1, deviceId, listener1);
-
-      server2.setPresent(uuid1, deviceId, connectedElsewhere -> {});
-
-      displaced.join();
-    }
-
-    @Test
-    void testDisconnectPresenceLocally() {
-      final UUID uuid1 = UUID.randomUUID();
-      final byte deviceId = 1;
-
-      final CompletableFuture<?> displaced = new CompletableFuture<>();
-      final DisplacedPresenceListener listener1 = connectedElsewhere -> displaced.complete(null);
-      server1.setPresent(uuid1, deviceId, listener1);
-
-      server1.disconnectPresence(uuid1, deviceId);
-
-      displaced.join();
-    }
-
-    @Test
-    void testDisconnectPresenceRemotely() {
-      final UUID uuid1 = UUID.randomUUID();
-      final byte deviceId = 1;
-
-      final CompletableFuture<?> displaced = new CompletableFuture<>();
-      final DisplacedPresenceListener listener1 = connectedElsewhere -> displaced.complete(null);
-      server1.setPresent(uuid1, deviceId, listener1);
-
-      server2.disconnectPresence(uuid1, deviceId);
-
-      displaced.join();
-    }
-
-    @RepeatedTest(value = 100)
-    void testConcurrentConnection() throws Exception {
-      final UUID uuid1 = UUID.randomUUID();
-      final byte deviceId = 1;
-
-      final CompletableFuture<?> displaced = new CompletableFuture<>();
-      final DisplacedPresenceListener listener1 = connectedElsewhere -> displaced.complete(null);
-
-      final Thread server1Thread = new Thread(() -> server1.setPresent(uuid1, deviceId, listener1));
-      final Thread server2Thread = new Thread(() -> server2.setPresent(uuid1, deviceId, listener1));
-
-      server1Thread.start();
-      server2Thread.start();
-
-      displaced.join();
-      server2Thread.join();
-      server1Thread.join();
-
-      while (server1.isLocallyPresent(uuid1, deviceId) == server2.isLocallyPresent(uuid1, deviceId)) {
-        Thread.sleep(50);
-      }
-    }
-
-  }
-}
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountCreationDeletionIntegrationTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountCreationDeletionIntegrationTest.java
@@ -43,7 +43,6 @@ import org.whispersystems.textsecuregcm.entities.ECSignedPreKey;
 import org.whispersystems.textsecuregcm.entities.GcmRegistrationId;
 import org.whispersystems.textsecuregcm.entities.KEMSignedPreKey;
 import org.whispersystems.textsecuregcm.identity.IdentityType;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.PubSubClientEventManager;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClient;
 import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
@@ -74,7 +73,6 @@ public class AccountCreationDeletionIntegrationTest {
  private static final Clock CLOCK = Clock.fixed(Instant.now(), ZoneId.systemDefault());

  private ExecutorService accountLockExecutor;
-  private ExecutorService clientPresenceExecutor;

  private AccountsManager accountsManager;
  private KeysManager keysManager;
@@ -112,7 +110,6 @@ public class AccountCreationDeletionIntegrationTest {
        DynamoDbExtensionSchema.Tables.USED_LINK_DEVICE_TOKENS.tableName());

    accountLockExecutor = Executors.newSingleThreadExecutor();
-    clientPresenceExecutor = Executors.newSingleThreadExecutor();

    final AccountLockManager accountLockManager = new AccountLockManager(DYNAMO_DB_EXTENSION.getDynamoDbClient(),
        DynamoDbExtensionSchema.Tables.DELETED_ACCOUNTS_LOCK.tableName());
@@ -141,6 +138,10 @@ public class AccountCreationDeletionIntegrationTest {
    when(registrationRecoveryPasswordsManager.removeForNumber(any()))
        .thenReturn(CompletableFuture.completedFuture(null));

+    final PubSubClientEventManager pubSubClientEventManager = mock(PubSubClientEventManager.class);
+    when(pubSubClientEventManager.requestDisconnection(any()))
+        .thenReturn(CompletableFuture.completedFuture(null));
+
    accountsManager = new AccountsManager(
        accounts,
        phoneNumberIdentifiers,
@@ -152,12 +153,10 @@ public class AccountCreationDeletionIntegrationTest {
        profilesManager,
        secureStorageClient,
        svr2Client,
-        mock(ClientPresenceManager.class),
-        mock(PubSubClientEventManager.class),
+        pubSubClientEventManager,
        registrationRecoveryPasswordsManager,
        clientPublicKeysManager,
        accountLockExecutor,
-        clientPresenceExecutor,
        CLOCK,
        "link-device-secret".getBytes(StandardCharsets.UTF_8),
        dynamicConfigurationManager);
@@ -166,13 +165,9 @@ public class AccountCreationDeletionIntegrationTest {
  @AfterEach
  void tearDown() throws InterruptedException {
    accountLockExecutor.shutdown();
-    clientPresenceExecutor.shutdown();

    //noinspection ResultOfMethodCallIgnored
    accountLockExecutor.awaitTermination(1, TimeUnit.SECONDS);
-
-    //noinspection ResultOfMethodCallIgnored
-    clientPresenceExecutor.awaitTermination(1, TimeUnit.SECONDS);
  }

  @CartesianTest
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerChangeNumberIntegrationTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerChangeNumberIntegrationTest.java
@@ -36,7 +36,6 @@ import org.whispersystems.textsecuregcm.controllers.MismatchedDevicesException;
 import org.whispersystems.textsecuregcm.entities.AccountAttributes;
 import org.whispersystems.textsecuregcm.entities.ECSignedPreKey;
 import org.whispersystems.textsecuregcm.identity.IdentityType;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.PubSubClientEventManager;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClient;
 import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
@@ -67,10 +66,8 @@ class AccountsManagerChangeNumberIntegrationTest {
  static final RedisClusterExtension CACHE_CLUSTER_EXTENSION = RedisClusterExtension.builder().build();

  private KeysManager keysManager;
-  private ClientPresenceManager clientPresenceManager;
  private PubSubClientEventManager pubSubClientEventManager;
  private ExecutorService accountLockExecutor;
-  private ExecutorService clientPresenceExecutor;

  private AccountsManager accountsManager;

@@ -106,7 +103,6 @@ class AccountsManagerChangeNumberIntegrationTest {
          Tables.USED_LINK_DEVICE_TOKENS.tableName());

      accountLockExecutor = Executors.newSingleThreadExecutor();
-      clientPresenceExecutor = Executors.newSingleThreadExecutor();

      final AccountLockManager accountLockManager = new AccountLockManager(DYNAMO_DB_EXTENSION.getDynamoDbClient(),
          Tables.DELETED_ACCOUNTS_LOCK.tableName());
@@ -120,7 +116,6 @@ class AccountsManagerChangeNumberIntegrationTest {
      final SecureValueRecovery2Client svr2Client = mock(SecureValueRecovery2Client.class);
      when(svr2Client.deleteBackups(any())).thenReturn(CompletableFuture.completedFuture(null));

-      clientPresenceManager = mock(ClientPresenceManager.class);
      pubSubClientEventManager = mock(PubSubClientEventManager.class);

      final PhoneNumberIdentifiers phoneNumberIdentifiers =
@@ -149,12 +144,10 @@ class AccountsManagerChangeNumberIntegrationTest {
          profilesManager,
          secureStorageClient,
          svr2Client,
-          clientPresenceManager,
          pubSubClientEventManager,
          registrationRecoveryPasswordsManager,
          clientPublicKeysManager,
          accountLockExecutor,
-          clientPresenceExecutor,
          mock(Clock.class),
          "link-device-secret".getBytes(StandardCharsets.UTF_8),
          dynamicConfigurationManager);
@@ -164,13 +157,9 @@ class AccountsManagerChangeNumberIntegrationTest {
  @AfterEach
  void tearDown() throws InterruptedException {
    accountLockExecutor.shutdown();
-    clientPresenceExecutor.shutdown();

    //noinspection ResultOfMethodCallIgnored
    accountLockExecutor.awaitTermination(1, TimeUnit.SECONDS);
-
-    //noinspection ResultOfMethodCallIgnored
-    clientPresenceExecutor.awaitTermination(1, TimeUnit.SECONDS);
  }

  @Test
@@ -285,7 +274,6 @@ class AccountsManagerChangeNumberIntegrationTest {

    assertEquals(secondNumber, accountsManager.getByAccountIdentifier(originalUuid).map(Account::getNumber).orElseThrow());

-    verify(clientPresenceManager).disconnectAllPresencesForUuid(existingAccountUuid);
    verify(pubSubClientEventManager).requestDisconnection(existingAccountUuid);

    assertEquals(Optional.of(existingAccountUuid), accountsManager.findRecentlyDeletedAccountIdentifier(originalNumber));
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerConcurrentModificationIntegrationTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerConcurrentModificationIntegrationTest.java
@@ -48,7 +48,6 @@ import org.whispersystems.textsecuregcm.auth.UnidentifiedAccessUtil;
 import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
 import org.whispersystems.textsecuregcm.entities.AccountAttributes;
 import org.whispersystems.textsecuregcm.identity.IdentityType;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.PubSubClientEventManager;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClient;
 import org.whispersystems.textsecuregcm.securestorage.SecureStorageClient;
@@ -134,12 +133,10 @@ class AccountsManagerConcurrentModificationIntegrationTest {
          mock(ProfilesManager.class),
          mock(SecureStorageClient.class),
          mock(SecureValueRecovery2Client.class),
-          mock(ClientPresenceManager.class),
          mock(PubSubClientEventManager.class),
          mock(RegistrationRecoveryPasswordsManager.class),
          mock(ClientPublicKeysManager.class),
          mock(Executor.class),
-          mock(Executor.class),
          mock(Clock.class),
          "link-device-secret".getBytes(StandardCharsets.UTF_8),
          dynamicConfigurationManager
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerDeviceTransferIntegrationTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerDeviceTransferIntegrationTest.java
@@ -14,7 +14,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 import org.whispersystems.textsecuregcm.entities.RestoreAccountRequest;
 import org.whispersystems.textsecuregcm.entities.RemoteAttachment;
 import org.whispersystems.textsecuregcm.identity.IdentityType;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.PubSubClientEventManager;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClusterClient;
 import org.whispersystems.textsecuregcm.redis.RedisServerExtension;
@@ -63,12 +62,10 @@ public class AccountsManagerDeviceTransferIntegrationTest {
        mock(ProfilesManager.class),
        mock(SecureStorageClient.class),
        mock(SecureValueRecovery2Client.class),
-        mock(ClientPresenceManager.class),
        mock(PubSubClientEventManager.class),
        mock(RegistrationRecoveryPasswordsManager.class),
        mock(ClientPublicKeysManager.class),
        mock(ExecutorService.class),
-        mock(ExecutorService.class),
        Clock.systemUTC(),
        "link-device-secret".getBytes(StandardCharsets.UTF_8),
        mock(DynamicConfigurationManager.class));
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerTest.java
@@ -79,7 +79,6 @@ import org.whispersystems.textsecuregcm.entities.KEMSignedPreKey;
 import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
 import org.whispersystems.textsecuregcm.identity.IdentityType;
 import org.whispersystems.textsecuregcm.identity.PniServiceIdentifier;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.PubSubClientEventManager;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClient;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClusterClient;
@@ -118,7 +117,6 @@ class AccountsManagerTest {
  private KeysManager keysManager;
  private MessagesManager messagesManager;
  private ProfilesManager profilesManager;
-  private ClientPresenceManager clientPresenceManager;
  private PubSubClientEventManager pubSubClientEventManager;
  private ClientPublicKeysManager clientPublicKeysManager;

@@ -154,20 +152,10 @@ class AccountsManagerTest {
    keysManager = mock(KeysManager.class);
    messagesManager = mock(MessagesManager.class);
    profilesManager = mock(ProfilesManager.class);
-    clientPresenceManager = mock(ClientPresenceManager.class);
    pubSubClientEventManager = mock(PubSubClientEventManager.class);
    clientPublicKeysManager = mock(ClientPublicKeysManager.class);
    dynamicConfiguration = mock(DynamicConfiguration.class);

-    final Executor clientPresenceExecutor = mock(Executor.class);
-
-    doAnswer(invocation -> {
-      final Runnable runnable = invocation.getArgument(0);
-      runnable.run();
-
-      return null;
-    }).when(clientPresenceExecutor).execute(any());
-
    //noinspection unchecked
    asyncCommands = mock(RedisAsyncCommands.class);
    when(asyncCommands.set(any(), any(), any())).thenReturn(MockRedisFuture.completedFuture("OK"));
@@ -250,6 +238,9 @@ class AccountsManagerTest {
        .stringAsyncCommands(asyncClusterCommands)
        .build();

+    when(pubSubClientEventManager.requestDisconnection(any()))
+        .thenReturn(CompletableFuture.completedFuture(null));
+
    accountsManager = new AccountsManager(
        accounts,
        phoneNumberIdentifiers,
@@ -261,12 +252,10 @@ class AccountsManagerTest {
        profilesManager,
        storageClient,
        svr2Client,
-        clientPresenceManager,
        pubSubClientEventManager,
        registrationRecoveryPasswordsManager,
        clientPublicKeysManager,
        mock(Executor.class),
-        clientPresenceExecutor,
        CLOCK,
        LINK_DEVICE_SECRET,
        dynamicConfigurationManager);
@@ -802,7 +791,6 @@ class AccountsManagerTest {
    verify(keysManager, times(2)).deleteSingleUsePreKeys(account.getUuid(), linkedDevice.getId());
    verify(keysManager).buildWriteItemsForRemovedDevice(account.getUuid(), account.getPhoneNumberIdentifier(), linkedDevice.getId());
    verify(clientPublicKeysManager).buildTransactWriteItemForDeletion(account.getUuid(), linkedDevice.getId());
-    verify(clientPresenceManager).disconnectPresence(account.getUuid(), linkedDevice.getId());
    verify(pubSubClientEventManager).requestDisconnection(account.getUuid(), List.of(linkedDevice.getId()));
  }

@@ -821,7 +809,6 @@ class AccountsManagerTest {
    assertDoesNotThrow(account::getPrimaryDevice);
    verify(messagesManager, never()).clear(any(), anyByte());
    verify(keysManager, never()).deleteSingleUsePreKeys(any(), anyByte());
-    verify(clientPresenceManager, never()).disconnectPresence(any(), anyByte());
    verify(pubSubClientEventManager, never()).requestDisconnection(any(), any());
  }

@@ -891,7 +878,6 @@ class AccountsManagerTest {
    verify(keysManager, times(2)).deleteSingleUsePreKeys(phoneNumberIdentifiersByE164.get(e164));
    verify(messagesManager, times(2)).clear(existingUuid);
    verify(profilesManager, times(2)).deleteAll(existingUuid);
-    verify(clientPresenceManager).disconnectAllPresencesForUuid(existingUuid);
    verify(pubSubClientEventManager).requestDisconnection(existingUuid);
  }

--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerUsernameIntegrationTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerUsernameIntegrationTest.java
@@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.mockito.Mockito;
 import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.PubSubClientEventManager;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClient;
 import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
@@ -135,6 +134,9 @@ class AccountsManagerUsernameIntegrationTest {
    when(messageManager.clear(any())).thenReturn(CompletableFuture.completedFuture(null));
    when(profileManager.deleteAll(any())).thenReturn(CompletableFuture.completedFuture(null));

+    final PubSubClientEventManager pubSubClientEventManager = mock(PubSubClientEventManager.class);
+    when(pubSubClientEventManager.requestDisconnection(any())).thenReturn(CompletableFuture.completedFuture(null));
+
    accountsManager = new AccountsManager(
        accounts,
        phoneNumberIdentifiers,
@@ -146,12 +148,10 @@ class AccountsManagerUsernameIntegrationTest {
        profileManager,
        mock(SecureStorageClient.class),
        mock(SecureValueRecovery2Client.class),
-        mock(ClientPresenceManager.class),
-        mock(PubSubClientEventManager.class),
+        pubSubClientEventManager,
        mock(RegistrationRecoveryPasswordsManager.class),
        mock(ClientPublicKeysManager.class),
        Executors.newSingleThreadExecutor(),
-        Executors.newSingleThreadExecutor(),
        mock(Clock.class),
        "link-device-secret".getBytes(StandardCharsets.UTF_8),
        dynamicConfigurationManager);
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AddRemoveDeviceIntegrationTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AddRemoveDeviceIntegrationTest.java
@@ -33,7 +33,6 @@ import org.signal.libsignal.protocol.ecc.ECKeyPair;
 import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
 import org.whispersystems.textsecuregcm.entities.DeviceInfo;
 import org.whispersystems.textsecuregcm.identity.IdentityType;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.PubSubClientEventManager;
 import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
 import org.whispersystems.textsecuregcm.redis.RedisServerExtension;
@@ -70,7 +69,6 @@ public class AddRemoveDeviceIntegrationTest {
  private static final Clock CLOCK = Clock.fixed(Instant.now(), ZoneId.systemDefault());

  private ExecutorService accountLockExecutor;
-  private ExecutorService clientPresenceExecutor;

  private KeysManager keysManager;
  private ClientPublicKeysManager clientPublicKeysManager;
@@ -107,7 +105,6 @@ public class AddRemoveDeviceIntegrationTest {
        DynamoDbExtensionSchema.Tables.USED_LINK_DEVICE_TOKENS.tableName());

    accountLockExecutor = Executors.newSingleThreadExecutor();
-    clientPresenceExecutor = Executors.newSingleThreadExecutor();

    final AccountLockManager accountLockManager = new AccountLockManager(DYNAMO_DB_EXTENSION.getDynamoDbClient(),
        DynamoDbExtensionSchema.Tables.DELETED_ACCOUNTS_LOCK.tableName());
@@ -152,12 +149,10 @@ public class AddRemoveDeviceIntegrationTest {
        profilesManager,
        secureStorageClient,
        svr2Client,
-        mock(ClientPresenceManager.class),
        mock(PubSubClientEventManager.class),
        registrationRecoveryPasswordsManager,
        clientPublicKeysManager,
        accountLockExecutor,
-        clientPresenceExecutor,
        CLOCK,
        "link-device-secret".getBytes(StandardCharsets.UTF_8),
        dynamicConfigurationManager);
@@ -170,13 +165,9 @@ public class AddRemoveDeviceIntegrationTest {
    accountsManager.stop();

    accountLockExecutor.shutdown();
-    clientPresenceExecutor.shutdown();

    //noinspection ResultOfMethodCallIgnored
    accountLockExecutor.awaitTermination(1, TimeUnit.SECONDS);
-
-    //noinspection ResultOfMethodCallIgnored
-    clientPresenceExecutor.awaitTermination(1, TimeUnit.SECONDS);
  }

  @Test
--- a/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java
@@ -57,7 +57,6 @@ import org.whispersystems.textsecuregcm.auth.AuthenticatedDevice;
 import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
 import org.whispersystems.textsecuregcm.limits.MessageDeliveryLoopMonitor;
 import org.whispersystems.textsecuregcm.metrics.MessageMetrics;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.PubSubClientEventManager;
 import org.whispersystems.textsecuregcm.push.PushNotificationManager;
 import org.whispersystems.textsecuregcm.push.PushNotificationScheduler;
@@ -125,7 +124,7 @@ class WebSocketConnectionTest {
        new WebSocketAccountAuthenticator(accountAuthenticator, mock(PrincipalSupplier.class));
    AuthenticatedConnectListener connectListener = new AuthenticatedConnectListener(receiptSender, messagesManager,
        new MessageMetrics(), mock(PushNotificationManager.class), mock(PushNotificationScheduler.class),
-        mock(ClientPresenceManager.class), mock(PubSubClientEventManager.class), retrySchedulingExecutor,
+        mock(PubSubClientEventManager.class), retrySchedulingExecutor,
        messageDeliveryScheduler, clientReleaseManager, mock(MessageDeliveryLoopMonitor.class));
    WebSocketSessionContext sessionContext = mock(WebSocketSessionContext.class);

--- a/service/src/test/java/org/whispersystems/textsecuregcm/workers/FinishPushNotificationExperimentCommandTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/workers/FinishPushNotificationExperimentCommandTest.java
@@ -73,7 +73,6 @@ class FinishPushNotificationExperimentCommandTest {
        null,
        null,
        null,
-        null,
        pushNotificationExperimentSamples,
        null,
        null,
--- a/service/src/test/java/org/whispersystems/textsecuregcm/workers/NotifyIdleDevicesCommandTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/workers/NotifyIdleDevicesCommandTest.java
@@ -66,7 +66,6 @@ class NotifyIdleDevicesCommandTest {
          null,
          null,
          null,
-          null,
          null);

      this.idleDeviceNotificationScheduler = idleDeviceNotificationScheduler;
--- a/service/src/test/java/org/whispersystems/textsecuregcm/workers/StartPushNotificationExperimentCommandTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/workers/StartPushNotificationExperimentCommandTest.java
@@ -62,7 +62,6 @@ class StartPushNotificationExperimentCommandTest {
          null,
          null,
          null,
-          null,
          pushNotificationExperimentSamples,
          null,
          null,