Remove code that’s only used by unit tests

Author: max-signal

Signal/test/util/GRDBFinderTest.swift

@@ -80,49 +80,19 @@ class GRDBFinderTest: SignalBaseTest {
     func testSignalAccountFinder() {
 
         // We'll create SignalAccount for these...
-        let address1 = SignalServiceAddress(phoneNumber: "+16505550101")
-        let address2 = SignalServiceAddress(serviceId: Aci.randomForTesting(), phoneNumber: "+16505550102")
-        let address3 = SignalServiceAddress(serviceId: Aci.randomForTesting(), phoneNumber: "+16505550103")
-        let address4 = SignalServiceAddress.randomForTesting()
+        let phoneNumber1 = "+16505550101"
         // ...but not these.
-        let address5 = SignalServiceAddress(phoneNumber: "+16505550105")
-        let address6 = SignalServiceAddress(serviceId: Aci.randomForTesting(), phoneNumber: "+16505550106")
-        let address7 = SignalServiceAddress.randomForTesting()
+        let phoneNumber5 = "+16505550105"
 
         self.write { transaction in
-            SignalAccount(address: address1).anyInsert(transaction: transaction)
-            SignalAccount(address: address2).anyInsert(transaction: transaction)
-            SignalAccount(address: address3).anyInsert(transaction: transaction)
-            SignalAccount(address: address4).anyInsert(transaction: transaction)
+            SignalAccount(phoneNumber: phoneNumber1).anyInsert(transaction: transaction)
         }
 
         self.read { tx in
             // These should exist...
-            XCTAssertNotNil(SignalAccountFinder().signalAccount(for: address1, tx: tx))
-            // If we save a SignalAccount with just a phone number,
-            // we should later be able to look it up using a UUID & phone number,
-            XCTAssertNotNil(SignalAccountFinder().signalAccount(for: SignalServiceAddress(serviceId: Aci.randomForTesting(), phoneNumber: address1.phoneNumber!), tx: tx))
-            XCTAssertNotNil(SignalAccountFinder().signalAccount(for: address2, tx: tx))
-            // If we save a SignalAccount with just a phone number and UUID,
-            // we should later be able to look it up using just a UUID.
-            XCTAssertNotNil(SignalAccountFinder().signalAccount(for: SignalServiceAddress(address2.serviceId!), tx: tx))
-            // If we save a SignalAccount with just a phone number and UUID,
-            // we should later be able to look it up using just a phone number.
-            XCTAssertNotNil(SignalAccountFinder().signalAccount(for: SignalServiceAddress(phoneNumber: address2.phoneNumber!), tx: tx))
-            XCTAssertNotNil(SignalAccountFinder().signalAccount(for: address3, tx: tx))
-            XCTAssertNotNil(SignalAccountFinder().signalAccount(for: SignalServiceAddress(address3.serviceId!), tx: tx))
-            XCTAssertNotNil(SignalAccountFinder().signalAccount(for: SignalServiceAddress(phoneNumber: address3.phoneNumber!), tx: tx))
-            XCTAssertNotNil(SignalAccountFinder().signalAccount(for: address4, tx: tx))
-            // If we save a SignalAccount with just a UUID,
-            // we should later be able to look it up using a UUID & phone number,
-            XCTAssertNotNil(SignalAccountFinder().signalAccount(for: SignalServiceAddress(serviceId: address4.serviceId!, phoneNumber: "+16505550198"), tx: tx))
-
+            XCTAssertNotNil(SignalAccountFinder().signalAccount(for: phoneNumber1, tx: tx))
             // ...these don't.
-            XCTAssertNil(SignalAccountFinder().signalAccount(for: address5, tx: tx))
-            XCTAssertNil(SignalAccountFinder().signalAccount(for: address6, tx: tx))
-            XCTAssertNil(SignalAccountFinder().signalAccount(for: SignalServiceAddress(address6.serviceId!), tx: tx))
-            XCTAssertNil(SignalAccountFinder().signalAccount(for: SignalServiceAddress(phoneNumber: address6.phoneNumber!), tx: tx))
-            XCTAssertNil(SignalAccountFinder().signalAccount(for: address7, tx: tx))
+            XCTAssertNil(SignalAccountFinder().signalAccount(for: phoneNumber5, tx: tx))
         }
     }
 

SignalServiceKit/Contacts/ContactSyncAttachmentBuilder.swift

@@ -137,7 +137,17 @@ enum ContactSyncAttachmentBuilder {
 
     private static func localAccountToSync(localAddress: SignalServiceAddress) -> SignalAccount {
         // OWSContactsOutputStream requires all signalAccount to have a contact.
-        return SignalAccount(address: localAddress)
+        return SignalAccount(
+            recipientPhoneNumber: localAddress.phoneNumber,
+            recipientServiceId: localAddress.serviceId,
+            multipleAccountLabelText: nil,
+            cnContactId: nil,
+            givenName: "",
+            familyName: "",
+            nickname: "",
+            fullName: "",
+            contactAvatarHash: nil,
+        )
     }
 }
 

SignalServiceKit/Contacts/SignalAccount.swift

@@ -176,11 +176,10 @@ extension SignalAccount {
 // MARK: - Convenience Inits
 
 extension SignalAccount {
-    @objc
-    public convenience init(address: SignalServiceAddress) {
+    public convenience init(phoneNumber: String) {
         self.init(
-            recipientPhoneNumber: address.phoneNumber,
-            recipientServiceId: address.serviceId,
+            recipientPhoneNumber: phoneNumber,
+            recipientServiceId: nil,
             multipleAccountLabelText: nil,
             cnContactId: nil,
             givenName: "",

SignalServiceKit/Contacts/SignalAccountFinder.swift

@@ -6,28 +6,8 @@
 import GRDB
 import LibSignalClient
 
-public class SignalAccountFinder: NSObject {
-    func signalAccount(
-        for address: SignalServiceAddress,
-        tx: DBReadTransaction
-    ) -> SignalAccount? {
-        if
-            let serviceId = address.serviceId,
-            let serviceIdMatch = signalAccountWhere(
-                column: SignalAccount.columnName(.recipientServiceId),
-                matches: serviceId.serviceIdUppercaseString,
-                tx: tx
-            )
-        {
-            return serviceIdMatch
-        }
-        if
-            let phoneNumber = address.phoneNumber,
-            let phoneNumberMatch = signalAccount(for: phoneNumber, tx: tx)
-        {
-            return phoneNumberMatch
-        }
-        return nil
+public struct SignalAccountFinder {
+    public init() {
     }
 
     public func signalAccount(
@@ -48,54 +28,13 @@ public class SignalAccountFinder: NSObject {
         )
     }
 
-    func signalAccounts(
-        for addresses: [SignalServiceAddress],
-        tx: DBReadTransaction
-    ) -> [SignalAccount?] {
-        return Refinery<SignalServiceAddress, SignalAccount>(addresses).refine { addresses in
-            return signalAccountsForServiceIds(
-                addresses.map { $0.serviceId },
-                tx: tx
-            )
-        }.refine { addresses in
-            return signalAccountsForPhoneNumbers(
-                addresses.map { $0.phoneNumber },
-                tx: tx
-            )
-        }.values
-    }
-
     func signalAccounts(
         for phoneNumbers: [String],
         tx: DBReadTransaction
     ) -> [SignalAccount?] {
         return signalAccountsForPhoneNumbers(phoneNumbers, tx: tx)
     }
 
-    private func signalAccountsForServiceIds(
-        _ serviceIds: [ServiceId?],
-        tx: DBReadTransaction
-    ) -> [SignalAccount?] {
-        let accounts = signalAccountsWhere(
-            column: SignalAccount.columnName(.recipientServiceId),
-            anyValueIn: serviceIds.compactMap { $0?.serviceIdUppercaseString },
-            tx: tx
-        )
-
-        let index: [ServiceId?: [SignalAccount?]] = Dictionary(grouping: accounts) { $0?.recipientServiceId }
-        return serviceIds.map { maybeServiceId -> SignalAccount? in
-            guard
-                let serviceId = maybeServiceId,
-                let accountsForServiceId = index[serviceId],
-                let firstAccountForServiceId = accountsForServiceId.first
-            else {
-                return nil
-            }
-
-            return firstAccountForServiceId
-        }
-    }
-
     private func signalAccountsForPhoneNumbers(
         _ phoneNumbers: [String?],
         tx: DBReadTransaction
@@ -131,10 +70,6 @@ public class SignalAccountFinder: NSObject {
         let qms = Array(repeating: "?", count: values.count).joined(separator: ", ")
         let sql = "SELECT * FROM \(SignalAccount.databaseTableName) WHERE \(column) in (\(qms))"
 
-        /// Why did we use `allSignalAccounts` instead of `SignalAccount.anyFetchAll`?
-        /// The reason is that the `SignalAccountReadCache` needs to have
-        /// `didReadSignalAccount` called on it for each record we enumerate, and
-        /// `SignalAccount.anyEnumerate` has this built in.
         return allSignalAccounts(
             tx: tx,
             sql: sql,
@@ -149,10 +84,6 @@ public class SignalAccountFinder: NSObject {
     ) -> SignalAccount? {
         let sql = "SELECT * FROM \(SignalAccount.databaseTableName) WHERE \(column) = ? LIMIT 1"
 
-        /// Why did we use `allSignalAccounts` instead of `SignalAccount.anyFetchAll`?
-        /// The reason is that the `SignalAccountReadCache` needs to have
-        /// `didReadSignalAccount` called on it for each record we enumerate, and
-        /// `SignalAccount.anyEnumerate` has this built in.
         return allSignalAccounts(
             tx: tx,
             sql: sql,

SignalServiceKit/tests/Account/SignalAccountFinderTest.swift

@@ -20,62 +20,48 @@ class SignalAccountFinderTest: SSKBaseTest {
         }
     }
 
-    private func createAccount(serviceId: ServiceId, phoneNumber: E164?) -> SignalAccount {
+    private func createAccount(phoneNumber: E164) -> SignalAccount {
         write {
-            let account = SignalAccount(address: SignalServiceAddress(serviceId: serviceId, phoneNumber: phoneNumber?.stringValue))
+            let account = SignalAccount(phoneNumber: phoneNumber.stringValue)
             account.anyInsert(transaction: $0)
             return account
         }
     }
 
     func testFetchAccounts() {
-        let aci1 = Aci.randomForTesting()
         let pn1 = E164("+16505550100")!
-        let account1 = createAccount(serviceId: aci1, phoneNumber: pn1)
-
-        let aci2 = Aci.randomForTesting()
-        let account2 = createAccount(serviceId: aci2, phoneNumber: nil)
+        let account1 = createAccount(phoneNumber: pn1)
 
         // Nothing prevents us from creating multiple accounts for the same recipient.
-        let aci3 = Aci.randomForTesting()
         let pn3 = E164("+16505550101")!
-        let account3 = createAccount(serviceId: aci3, phoneNumber: pn3)
-        _ = createAccount(serviceId: aci3, phoneNumber: pn3)
+        let account3 = createAccount(phoneNumber: pn3)
+        _ = createAccount(phoneNumber: pn3)
 
         // Create an account but don't fetch it.
-        let aci4 = Aci.randomForTesting()
-        _ = createAccount(serviceId: aci4, phoneNumber: nil)
-
-        // Create a ServiceId without an account.
-        let aci5 = Aci.randomForTesting()
+        let pn4 = E164("+16505550102")!
+        _ = createAccount(phoneNumber: pn4)
 
-        // Create an account for a PNI-only contact
-        let pni6 = Pni.randomForTesting()
-        let pn6 = E164("+17735550155")!
-        let account6 = createAccount(serviceId: pni6, phoneNumber: pn6)
+        // Create a phone number without an account.
+        let pn5 = E164("+16505550103")!
 
-        let addressesToFetch: [SignalServiceAddress] = [
-            SignalServiceAddress(aci1),
-            SignalServiceAddress(aci2),
-            SignalServiceAddress(aci3),
-            SignalServiceAddress(aci5),
-            SignalServiceAddress(pni6),
+        let phoneNumbersToFetch: [E164] = [
+            pn1,
+            pn3,
+            pn5,
         ]
 
         let expectedAccounts: [SignalAccount?] = [
             account1,
-            account2,
             account3,
             nil,
-            account6,
         ]
 
         read { tx in
             let accountFinder = SignalAccountFinder()
-            let actualAccounts = accountFinder.signalAccounts(for: addressesToFetch, tx: tx)
+            let actualAccounts = accountFinder.signalAccounts(for: phoneNumbersToFetch.map(\.stringValue), tx: tx)
             XCTAssertEqual(
-                actualAccounts.map { $0?.recipientAddress },
-                expectedAccounts.map { $0?.recipientAddress }
+                actualAccounts.map { $0?.recipientPhoneNumber },
+                expectedAccounts.map { $0?.recipientPhoneNumber }
             )
         }
     }

SignalServiceKit/tests/Contacts/SignalRecipientTest.swift

@@ -173,7 +173,7 @@ class SignalRecipientTest: SSKBaseTest {
             )
             newPhoneNumberProfile.anyInsert(transaction: transaction)
 
-            let oldAccount = SignalAccount(address: oldAddress)
+            let oldAccount = SignalAccount(phoneNumber: oldAddress.phoneNumber!)
             oldAccount.anyInsert(transaction: transaction)
 
             mergeHighTrust(aci: aci, phoneNumber: oldPhoneNumber, transaction: transaction)
@@ -252,7 +252,7 @@ class SignalRecipientTest: SSKBaseTest {
                 transaction: transaction
             )
 
-            let oldAccount = SignalAccount(address: oldAddress)
+            let oldAccount = SignalAccount(phoneNumber: oldAddress.phoneNumber!)
             oldAccount.anyInsert(transaction: transaction)
 
             mergeHighTrust(aci: oldAci, phoneNumber: phoneNumber, transaction: transaction)