From 2fb400280bfe425e8666970c64b444c2c31b9cee Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Tue, 14 Sep 2021 17:59:50 -0700
Subject: [PATCH] Remove unused parameter from
 `deleteMessageByDestinationAndGuid`

---
 .../whispersystems/textsecuregcm/storage/MessagesDynamoDb.java | 3 ++-
 .../whispersystems/textsecuregcm/storage/MessagesManager.java  | 2 +-
 .../textsecuregcm/tests/storage/MessagesDynamoDbTest.java      | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDb.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDb.java
index 29c66bfb5..07e593198 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDb.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDb.java
@@ -136,7 +136,8 @@ public class MessagesDynamoDb extends AbstractDynamoDbStore {
     });
   }
 
-  public Optional<OutgoingMessageEntity> deleteMessageByDestinationAndGuid(final UUID destinationAccountUuid, final long destinationDeviceId, final UUID messageUuid) {
+  public Optional<OutgoingMessageEntity> deleteMessageByDestinationAndGuid(final UUID destinationAccountUuid,
+      final UUID messageUuid) {
     return deleteByGuid.record(() -> {
       final AttributeValue partitionKey = convertPartitionKey(destinationAccountUuid);
       final QueryRequest queryRequest = QueryRequest.builder()
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java
index fa1f09116..b99e397bb 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java
@@ -98,7 +98,7 @@ public class MessagesManager {
     Optional<OutgoingMessageEntity> removed = messagesCache.remove(destinationUuid, destinationDeviceId, guid);
 
     if (removed.isEmpty()) {
-      removed = messagesDynamoDb.deleteMessageByDestinationAndGuid(destinationUuid, destinationDeviceId, guid);
+      removed = messagesDynamoDb.deleteMessageByDestinationAndGuid(destinationUuid, guid);
       cacheMissByGuidMeter.mark();
     } else {
       cacheHitByGuidMeter.mark();
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/MessagesDynamoDbTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/MessagesDynamoDbTest.java
index 69071c11e..b197ab0e9 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/MessagesDynamoDbTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/MessagesDynamoDbTest.java
@@ -138,7 +138,8 @@ public class MessagesDynamoDbTest {
     assertThat(messagesDynamoDb.load(destinationUuid, 2, MessagesDynamoDb.RESULT_SET_CHUNK_SIZE)).isNotNull().hasSize(1).element(0).satisfies(verify(MESSAGE3));
     assertThat(messagesDynamoDb.load(secondDestinationUuid, 1, MessagesDynamoDb.RESULT_SET_CHUNK_SIZE)).isNotNull().hasSize(1).element(0).satisfies(verify(MESSAGE2));
 
-    messagesDynamoDb.deleteMessageByDestinationAndGuid(secondDestinationUuid, 1, UUID.fromString(MESSAGE2.getServerGuid()));
+    messagesDynamoDb.deleteMessageByDestinationAndGuid(secondDestinationUuid,
+        UUID.fromString(MESSAGE2.getServerGuid()));
 
     assertThat(messagesDynamoDb.load(destinationUuid, 1, MessagesDynamoDb.RESULT_SET_CHUNK_SIZE)).isNotNull().hasSize(1).element(0).satisfies(verify(MESSAGE1));
     assertThat(messagesDynamoDb.load(destinationUuid, 2, MessagesDynamoDb.RESULT_SET_CHUNK_SIZE)).isNotNull().hasSize(1).element(0).satisfies(verify(MESSAGE3));