From 5aaf4cad2071ec5e5e36e7074f5d302d163bf345 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Wed, 6 Nov 2024 15:59:13 -0500
Subject: [PATCH] Remove now-unused presence cluster configuration

---
 service/config/sample.yml                                | 3 ---
 .../textsecuregcm/WhisperServerConfiguration.java        | 9 ---------
 .../textsecuregcm/WhisperServerService.java              | 2 --
 .../textsecuregcm/workers/CommandDependencies.java       | 2 --
 service/src/test/resources/config/test.yml               | 3 ---
 5 files changed, 19 deletions(-)

diff --git a/service/config/sample.yml b/service/config/sample.yml
index ea0321b7f..fb60d3956 100644
--- a/service/config/sample.yml
+++ b/service/config/sample.yml
@@ -160,9 +160,6 @@ dynamoDbTables:
 cacheCluster: # Redis server configuration for cache cluster
   configurationUri: redis://redis.example.com:6379/
 
-clientPresenceCluster: # Redis server configuration for client presence cluster
-  configurationUri: redis://redis.example.com:6379/
-
 pubsub: # Redis server configuration for pubsub cluster
   uri: redis://redis.example.com:6379/
 
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
index 24d13c8b0..08643cbfb 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
@@ -165,11 +165,6 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private MessageCacheConfiguration messageCache;
 
-  @NotNull
-  @Valid
-  @JsonProperty
-  private FaultTolerantRedisClusterFactory clientPresenceCluster;
-
   @Valid
   @NotNull
   @JsonProperty
@@ -411,10 +406,6 @@ public class WhisperServerConfiguration extends Configuration {
     return messageCache;
   }
 
-  public FaultTolerantRedisClusterFactory getClientPresenceClusterConfiguration() {
-    return clientPresenceCluster;
-  }
-
   public FaultTolerantRedisClusterFactory getPushSchedulerCluster() {
     return pushSchedulerCluster;
   }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 658d4c52f..3754f38c3 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -451,8 +451,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     FaultTolerantRedisClusterClient messagesCluster =
         config.getMessageCacheConfiguration().getRedisClusterConfiguration()
             .build("messages", sharedClientResources.mutate());
-    FaultTolerantRedisClusterClient clientPresenceCluster = config.getClientPresenceClusterConfiguration()
-        .build("client_presence", sharedClientResources.mutate());
     FaultTolerantRedisClusterClient pushSchedulerCluster = config.getPushSchedulerCluster().build("push_scheduler",
         sharedClientResources.mutate());
     FaultTolerantRedisClusterClient rateLimitersCluster = config.getRateLimitersCluster().build("rate_limiters",
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 b9d9990aa..1a6295019 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java
@@ -199,8 +199,6 @@ record CommandDependencies(
         messageDeletionExecutor);
     FaultTolerantRedisClusterClient messagesCluster = configuration.getMessageCacheConfiguration()
         .getRedisClusterConfiguration().build("messages", redisClientResourcesBuilder);
-    FaultTolerantRedisClusterClient clientPresenceCluster = configuration.getClientPresenceClusterConfiguration()
-        .build("client_presence", redisClientResourcesBuilder);
     FaultTolerantRedisClusterClient rateLimitersCluster = configuration.getRateLimitersCluster().build("rate_limiters",
         redisClientResourcesBuilder);
     SecureValueRecovery2Client secureValueRecovery2Client = new SecureValueRecovery2Client(
diff --git a/service/src/test/resources/config/test.yml b/service/src/test/resources/config/test.yml
index 3b3d5f93e..8f381e250 100644
--- a/service/src/test/resources/config/test.yml
+++ b/service/src/test/resources/config/test.yml
@@ -156,9 +156,6 @@ dynamoDbTables:
 cacheCluster: # Redis server configuration for cache cluster
   type: local
 
-clientPresenceCluster: # Redis server configuration for client presence cluster
-  type: local
-
 pubsub: # Redis server configuration for pubsub cluster
   type: local