Respond to CR.

Signal/test/util/SearcherTest.swift

@@ -80,11 +80,11 @@ class ConversationSearcherTest: SignalBaseTest {
         SSKEnvironment.shared.contactsManager = ConversationSearcherContactsManager()
 
         self.dbConnection.readWrite { transaction in
-            let bookModel = TSGroupModel(title: "Book Club", memberIds: [aliceRecipientId, bobRecipientId], image: nil, groupId: Randomness.generateRandomBytes(Int32(kGroupIdLength)))
+            let bookModel = TSGroupModel(title: "Book Club", memberIds: [aliceRecipientId, bobRecipientId], image: nil, groupId: Randomness.generateRandomBytes(kGroupIdLength))
             let bookClubGroupThread = TSGroupThread.getOrCreateThread(with: bookModel, transaction: transaction)
             self.bookClubThread = ThreadViewModel(thread: bookClubGroupThread, transaction: transaction)
 
-            let snackModel = TSGroupModel(title: "Snack Club", memberIds: [aliceRecipientId], image: nil, groupId: Randomness.generateRandomBytes(Int32(kGroupIdLength)))
+            let snackModel = TSGroupModel(title: "Snack Club", memberIds: [aliceRecipientId], image: nil, groupId: Randomness.generateRandomBytes(kGroupIdLength))
             let snackClubGroupThread = TSGroupThread.getOrCreateThread(with: snackModel, transaction: transaction)
             self.snackClubThread = ThreadViewModel(thread: snackClubGroupThread, transaction: transaction)
 

SignalServiceKit/src/Messages/TSGroupModel.h

@@ -7,7 +7,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-extern const NSUInteger kGroupIdLength;
+extern const int32_t kGroupIdLength;
 
 @interface TSGroupModel : TSYapDatabaseObject
 

SignalServiceKit/src/Messages/TSGroupModel.m

@@ -8,7 +8,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-const NSUInteger kGroupIdLength = 16;
+const int32_t kGroupIdLength = 16;
 
 @interface TSGroupModel ()