De-protocolize RecipientDatabaseTable

Author: max-signal

Signal/src/ViewControllers/DebugUI/DebugUIMisc.swift

@@ -142,14 +142,6 @@ class DebugUIMisc: NSObject, DebugUIPage {
                 DebugUIMisc.logStickerSuggestions()
             }),
 
-            OWSTableItem(title: "Log Local Account", actionBlock: {
-                DebugUIMisc.logLocalAccount()
-            }),
-
-            OWSTableItem(title: "Log SignalRecipients", actionBlock: {
-                DebugUIMisc.logSignalRecipients()
-            }),
-
             OWSTableItem(title: "Clear Profile Key Credentials", actionBlock: {
                 DebugUIMisc.clearProfileKeyCredentials()
             }),
@@ -407,27 +399,6 @@ class DebugUIMisc: NSObject, DebugUIPage {
         Logger.verbose("emoji: \(combinedEmojiString)")
     }
 
-    private static func logLocalAccount() {
-        guard let localAddress = DependenciesBridge.shared.tsAccountManager.localIdentifiersWithMaybeSneakyTransaction?.aciAddress else {
-            owsFailDebug("Missing localAddress.")
-            return
-        }
-        if let serviceId = localAddress.serviceId {
-            Logger.verbose("localAddress serviceId: \(serviceId)")
-        }
-        if let phoneNumber = localAddress.phoneNumber {
-            Logger.verbose("localAddress phoneNumber: \(phoneNumber)")
-        }
-    }
-
-    private static func logSignalRecipients() {
-        SSKEnvironment.shared.databaseStorageRef.read { tx in
-            SignalRecipient.anyEnumerate(transaction: tx, batchingPreference: .batched(32)) { signalRecipient, _ in
-                Logger.verbose("SignalRecipient: \(signalRecipient.addressComponentsDescription)")
-            }
-        }
-    }
-
     private static func clearProfileKeyCredentials() {
         SSKEnvironment.shared.databaseStorageRef.write { transaction in
             SSKEnvironment.shared.versionedProfilesRef.clearProfileKeyCredentials(transaction: transaction)

Signal/src/ViewControllers/ThreadSettings/ContactAboutSheet.swift

@@ -13,7 +13,7 @@ class ContactAboutSheet: StackSheetViewController {
     struct Context {
         let contactManager: any ContactManager
         let identityManager: any OWSIdentityManager
-        let recipientDatabaseTable: any RecipientDatabaseTable
+        let recipientDatabaseTable: RecipientDatabaseTable
         let nicknameManager: any NicknameManager
 
         static let `default` = Context(

Signal/src/ViewControllers/ThreadSettings/ContactNoteSheet.swift

@@ -9,7 +9,7 @@ import SignalServiceKit
 class ContactNoteSheet: OWSTableSheetViewController {
     struct Context {
         let db: any DB
-        let recipientDatabaseTable: any RecipientDatabaseTable
+        let recipientDatabaseTable: RecipientDatabaseTable
         let nicknameManager: any NicknameManager
     }
 

Signal/test/Contacts/AuthorMergeHelperBuilderTest.swift

@@ -15,7 +15,7 @@ final class AuthorMergeHelperBuilderTest: XCTestCase {
         let appContext = TestAppContext()
         let authorMergeHelper = AuthorMergeHelper()
         let inMemoryDb = InMemoryDB()
-        let recipientDatabaseTable = MockRecipientDatabaseTable()
+        let recipientDatabaseTable = RecipientDatabaseTable()
 
         let aci1 = Aci.constantForTesting("00000000-0000-4000-8000-0000000000a1")
         let aci2 = Aci.constantForTesting("00000000-0000-4000-8000-0000000000a2")

Signal/test/Provisioning/ProvisionManagerTests.swift

@@ -21,7 +21,7 @@ public class ProvisioningManagerTests {
     private var mockReceiptManager: ProvisioningManager.Mocks.ReceiptManager!
     private var mockTsAccountManager: MockTSAccountManager!
 
-    let recipientDatabaseTable = MockRecipientDatabaseTable()
+    let recipientDatabaseTable = RecipientDatabaseTable()
     let recipientFetcher: RecipientFetcher
     let recipientIdFinder: RecipientIdFinder
 
@@ -35,7 +35,10 @@ public class ProvisioningManagerTests {
         self.mockReceiptManager = ProvisioningManager.Mocks.ReceiptManager()
         self.mockTsAccountManager = MockTSAccountManager()
 
-        recipientFetcher = RecipientFetcherImpl(recipientDatabaseTable: recipientDatabaseTable)
+        recipientFetcher = RecipientFetcherImpl(
+            recipientDatabaseTable: recipientDatabaseTable,
+            searchableNameIndexer: MockSearchableNameIndexer(),
+        )
         recipientIdFinder = RecipientIdFinder(recipientDatabaseTable: recipientDatabaseTable, recipientFetcher: recipientFetcher)
         mockIdentityManager = MockIdentityManager(recipientIdFinder: recipientIdFinder)
     }

Signal/test/Provisioning/ProvisioningCoordinatorTest.swift

@@ -37,8 +37,11 @@ public class ProvisioningCoordinatorTest: XCTestCase {
 
         let mockDb = InMemoryDB()
 
-        let recipientDbTable = MockRecipientDatabaseTable()
-        let recipientFetcher = RecipientFetcherImpl(recipientDatabaseTable: recipientDbTable)
+        let recipientDbTable = RecipientDatabaseTable()
+        let recipientFetcher = RecipientFetcherImpl(
+            recipientDatabaseTable: recipientDbTable,
+            searchableNameIndexer: MockSearchableNameIndexer(),
+        )
         let recipientIdFinder = RecipientIdFinder(
             recipientDatabaseTable: recipientDbTable,
             recipientFetcher: recipientFetcher

Signal/test/contact/OWSContactsManagerTest.swift

@@ -14,7 +14,7 @@ class OWSContactsManagerTest: SignalBaseTest {
 
     private let mockUsernameLookupMananger: MockUsernameLookupManager = .init()
     private let mockNicknameManager = MockNicknameManager()
-    private let mockRecipientDatabaseTable = MockRecipientDatabaseTable()
+    private let mockRecipientDatabaseTable = RecipientDatabaseTable()
 
     override func setUp() {
         super.setUp()
@@ -60,7 +60,7 @@ class OWSContactsManagerTest: SignalBaseTest {
     private func createRecipients(_ serviceIds: [ServiceId]) {
         let recipientFetcher = DependenciesBridge.shared.recipientFetcher
         let recipientManager = DependenciesBridge.shared.recipientManager
-        write { tx in
+        self.dbV2.write { tx in
             for serviceId in serviceIds {
                 recipientManager.markAsRegisteredAndSave(
                     recipientFetcher.fetchOrCreate(serviceId: serviceId, tx: tx),
@@ -72,7 +72,7 @@ class OWSContactsManagerTest: SignalBaseTest {
     }
 
     private func createAccounts(_ accounts: [SignalAccount]) {
-        write { transaction in
+        self.dbV2.write { transaction in
             for account in accounts {
                 account.anyInsert(transaction: transaction)
             }
@@ -148,7 +148,7 @@ class OWSContactsManagerTest: SignalBaseTest {
             mockNicknameManager.insert(bobNickname, tx: tx)
         }
 
-        self.read { tx in
+        self.dbV2.read { tx in
             let contactsManager = SSKEnvironment.shared.contactManagerRef as! OWSContactsManager
             let actual = contactsManager.displayNames(
                 for: [aliceAddress, bobAddress],
@@ -169,7 +169,7 @@ class OWSContactsManagerTest: SignalBaseTest {
             makeAccount(serviceId: address.serviceId!, phoneNumber: address.e164!, fullName: name)
         })
 
-        read { transaction in
+        self.dbV2.read { transaction in
             let contactsManager = SSKEnvironment.shared.contactManagerRef as! OWSContactsManager
             let actual = contactsManager.displayNames(for: addresses, tx: transaction).map { $0.resolvedValue() }
             let expected = ["Alice Aliceson (home)", "Bob Bobson (home)"]
@@ -183,7 +183,7 @@ class OWSContactsManagerTest: SignalBaseTest {
             addresses[0]: makeUserProfile(givenName: "Alice", familyName: "Aliceson"),
             addresses[1]: makeUserProfile(givenName: "Bob", familyName: "Bobson"),
         ]
-        read { transaction in
+        self.dbV2.read { transaction in
             let contactsManager = SSKEnvironment.shared.contactManagerRef as! OWSContactsManager
             let actual = contactsManager.displayNames(for: addresses, tx: transaction).map { $0.resolvedValue() }
             let expected = ["Alice Aliceson", "Bob Bobson"]
@@ -198,7 +198,7 @@ class OWSContactsManagerTest: SignalBaseTest {
         ]
         // Prevent default fake name from being used.
         (SSKEnvironment.shared.profileManagerRef as! OWSFakeProfileManager).fakeUserProfiles = [:]
-        read { transaction in
+        self.dbV2.read { transaction in
             let contactsManager = SSKEnvironment.shared.contactManagerRef as! OWSContactsManager
             let actual = contactsManager.displayNames(for: addresses, tx: transaction).map { $0.resolvedValue() }
             let expected = ["+1 703-555-9900", "+1 703-555-9901"]
@@ -222,7 +222,7 @@ class OWSContactsManagerTest: SignalBaseTest {
         // Prevent default fake names from being used.
         (SSKEnvironment.shared.profileManagerRef as! OWSFakeProfileManager).fakeUserProfiles = [:]
 
-        read { transaction in
+        dbV2.read { transaction in
             let contactsManager = SSKEnvironment.shared.contactManagerRef as! OWSContactsManager
             let actual = contactsManager.displayNames(for: addresses, tx: transaction).map { $0.resolvedValue() }
             let expected = ["alice", "bob"]
@@ -237,7 +237,7 @@ class OWSContactsManagerTest: SignalBaseTest {
         // default fake names from being used.
         (SSKEnvironment.shared.profileManagerRef as! OWSFakeProfileManager).fakeUserProfiles = [:]
 
-        read { transaction in
+        dbV2.read { transaction in
             let contactsManager = SSKEnvironment.shared.contactManagerRef as! OWSContactsManager
             let actual = contactsManager.displayNames(for: addresses, tx: transaction).map { $0.resolvedValue() }
             let expected = ["Unknown", "Unknown"]
@@ -285,7 +285,7 @@ class OWSContactsManagerTest: SignalBaseTest {
             mockNicknameManager.insert(feliciaNickname, tx: tx)
         }
 
-        read { transaction in
+        dbV2.read { transaction in
             let addresses = [aliceAddress, bobAddress, carolAddress, daveAddress, eveAddress, feliciaAddress]
             let actual = SSKEnvironment.shared.contactManagerRef.displayNames(for: addresses, tx: transaction).map { $0.resolvedValue() }
             let expected = ["Alice Aliceson (home)", "Bob Bobson", "+1 703-555-9900", "dave", "Unknown", "Felicia Felicity"]
@@ -303,7 +303,7 @@ class OWSContactsManagerTest: SignalBaseTest {
             makeAccount(serviceId: address.serviceId!, phoneNumber: address.e164!, fullName: name)
         })
 
-        read { transaction in
+        dbV2.read { transaction in
             let contactsManager = SSKEnvironment.shared.contactManagerRef as! OWSContactsManager
             let actual = contactsManager.displayNames(for: addresses, tx: transaction).map { $0.resolvedValue() }
             let expected = ["Alice (home)", "Bob (home)"]
@@ -323,7 +323,7 @@ class OWSContactsManagerTest: SignalBaseTest {
             makeAccount(serviceId: address.serviceId!, phoneNumber: address.e164!, fullName: name)
         })
         let contactsManager = makeContactsManager()
-        read { transaction in
+        dbV2.read { transaction in
             let actual = contactsManager.systemContactNames(for: addresses.map { $0.phoneNumber! }, tx: transaction).map { $0?.resolvedValue() }
             let expected = ["Alice Aliceson (home)", "Bob Bobson (home)"]
             XCTAssertEqual(actual, expected)
@@ -343,7 +343,7 @@ class OWSContactsManagerTest: SignalBaseTest {
         let chuckAddress = SignalServiceAddress(serviceId: chuckAci, phoneNumber: "+16505550101")
 
         let contactsManager = makeContactsManager()
-        read { transaction in
+        dbV2.read { transaction in
             let addresses = [aliceAddress, chuckAddress]
             let actual = contactsManager.systemContactNames(for: addresses.map { $0.phoneNumber! }, tx: transaction).map { $0?.resolvedValue() }
             let expected = ["Alice Aliceson (home)", nil]

Signal/test/util/GRDBFinderTest.swift

@@ -138,10 +138,10 @@ class GRDBFinderTest: SignalBaseTest {
         let address6 = SignalServiceAddress(serviceId: Aci.randomForTesting(), phoneNumber: "+16505550106")
         let address7 = SignalServiceAddress.randomForTesting()
 
+        let recipientDatabaseTable = DependenciesBridge.shared.recipientDatabaseTable
         self.write { transaction in
             [address1, address2, address3, address4].forEach {
-                SignalRecipient(aci: $0.aci, pni: nil, phoneNumber: $0.e164)
-                    .anyInsert(transaction: transaction)
+                recipientDatabaseTable.insertRecipient(SignalRecipient(aci: $0.aci, pni: nil, phoneNumber: $0.e164), transaction: transaction)
             }
         }
 

SignalServiceKit/Account/PniHelloWorldManager.swift

@@ -40,7 +40,7 @@ class PniHelloWorldManagerImpl: PniHelloWorldManager {
     private let pniDistributionParameterBuilder: PniDistributionParamaterBuilder
     private let pniSignedPreKeyStore: SignedPreKeyStoreImpl
     private let pniKyberPreKeyStore: KyberPreKeyStoreImpl
-    private let recipientDatabaseTable: any RecipientDatabaseTable
+    private let recipientDatabaseTable: RecipientDatabaseTable
     private let tsAccountManager: TSAccountManager
 
     init(
@@ -50,7 +50,7 @@ class PniHelloWorldManagerImpl: PniHelloWorldManager {
         pniDistributionParameterBuilder: PniDistributionParamaterBuilder,
         pniSignedPreKeyStore: SignedPreKeyStoreImpl,
         pniKyberPreKeyStore: KyberPreKeyStoreImpl,
-        recipientDatabaseTable: any RecipientDatabaseTable,
+        recipientDatabaseTable: RecipientDatabaseTable,
         tsAccountManager: TSAccountManager
     ) {
         self.db = db

SignalServiceKit/Contacts/Discovery/ContactDiscoveryTask.swift

@@ -129,6 +129,6 @@ final class ContactDiscoveryTaskQueueImpl: ContactDiscoveryTaskQueue {
             return
         }
         recipient.phoneNumber?.isDiscoverable = isPhoneNumberDiscoverable
-        recipient.anyOverwritingUpdate(transaction: SDSDB.shimOnlyBridge(tx))
+        recipientDatabaseTable.updateRecipient(recipient, transaction: tx)
     }
 }