Refine decrypt deduplication.

Author: charlesmchen-signal

SignalServiceKit/Resources/schema.sql

@@ -1237,8 +1237,6 @@ CREATE
     TABLE
         IF NOT EXISTS "MessageDecryptDeduplication" (
             "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
-            ,"envelopeTimestamp" INTEGER NOT NULL
-            ,"serviceTimestamp" INTEGER NOT NULL
             ,"serverGuid" TEXT NOT NULL
         )
 ;

SignalServiceKit/src/Messages/MessageProcessor.swift

@@ -473,13 +473,9 @@ class MessageDecryptDeduplicationRecord: Codable, FetchableRecord, PersistableRe
     static let databaseTableName = "MessageDecryptDeduplication"
 
     var id: Int64?
-    let envelopeTimestamp: UInt64
-    let serviceTimestamp: UInt64
     let serverGuid: String
 
-    init(envelopeTimestamp: UInt64, serviceTimestamp: UInt64, serverGuid: String) {
-        self.envelopeTimestamp = envelopeTimestamp
-        self.serviceTimestamp = serviceTimestamp
+    init(serverGuid: String) {
         self.serverGuid = serverGuid
     }
 
@@ -540,9 +536,7 @@ class MessageDecryptDeduplicationRecord: Codable, FetchableRecord, PersistableRe
             }
 
             // No existing record found. Create a new one and insert it.
-            let record = MessageDecryptDeduplicationRecord(envelopeTimestamp: envelopeTimestamp,
-                                                           serviceTimestamp: serviceTimestamp,
-                                                           serverGuid: serverGuid)
+            let record = MessageDecryptDeduplicationRecord(serverGuid: serverGuid)
             try record.insert(transaction.unwrapGrdbWrite.database)
 
             if !skipCull, shouldCull() {

SignalServiceKit/src/Storage/Database/GRDBSchemaMigrator.swift

@@ -113,7 +113,7 @@ public class GRDBSchemaMigrator: NSObject {
         case updateMessageSendLogColumnTypes
         case addRecordTypeIndex
         case tunedConversationLoadIndices
-        case messageDecryptDeduplicationV4
+        case messageDecryptDeduplicationV5
 
         // NOTE: Every time we add a migration id, consider
         // incrementing grdbSchemaVersionLatest.
@@ -1446,7 +1446,7 @@ public class GRDBSchemaMigrator: NSObject {
             }
         }
 
-        migrator.registerMigration(MigrationId.messageDecryptDeduplicationV4.rawValue) { db in
+        migrator.registerMigration(MigrationId.messageDecryptDeduplicationV5.rawValue) { db in
             do {
                 if try db.tableExists("MessageDecryptDeduplication") {
                     try db.drop(table: "MessageDecryptDeduplication")
@@ -1455,10 +1455,6 @@ public class GRDBSchemaMigrator: NSObject {
                 try db.create(table: "MessageDecryptDeduplication") { table in
                     table.autoIncrementedPrimaryKey("id")
                         .notNull()
-                    table.column("envelopeTimestamp", .integer)
-                        .notNull()
-                    table.column("serviceTimestamp", .integer)
-                        .notNull()
                     table.column("serverGuid", .text)
                         .notNull()
                 }