Consolidate various Signal Protocol-related files

Signal.xcodeproj/project.pbxproj

@@ -1064,7 +1064,7 @@
 		66586D3829005A1B00DDA9B9 /* story_viewer_onboarding_1.json in Resources */ = {isa = PBXBuildFile; fileRef = 66586D3529005A1B00DDA9B9 /* story_viewer_onboarding_1.json */; };
 		66586D3929005A1B00DDA9B9 /* story_viewer_onboarding_3.json in Resources */ = {isa = PBXBuildFile; fileRef = 66586D3629005A1B00DDA9B9 /* story_viewer_onboarding_3.json */; };
 		66586D4129009C0000DDA9B9 /* TextAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66586D4029009C0000DDA9B9 /* TextAttachment.swift */; };
-		6659A0262A7C11A800066AB7 /* PrekeyManagerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6659A0252A7C11A800066AB7 /* PrekeyManagerImpl.swift */; };
+		6659A0262A7C11A800066AB7 /* PreKeyManagerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6659A0252A7C11A800066AB7 /* PreKeyManagerImpl.swift */; };
 		6659A0282A7C11ED00066AB7 /* MockPreKeyManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6659A0272A7C11ED00066AB7 /* MockPreKeyManager.swift */; };
 		6659A0312A7C5B9700066AB7 /* PreKeyUploadBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6659A0302A7C5B9700066AB7 /* PreKeyUploadBundle.swift */; };
 		6659A0392A81933B00066AB7 /* ProvisioningPermissionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6659A0382A81933B00066AB7 /* ProvisioningPermissionsViewController.swift */; };
@@ -5337,7 +5337,7 @@
 		66586D3529005A1B00DDA9B9 /* story_viewer_onboarding_1.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = story_viewer_onboarding_1.json; sourceTree = "<group>"; };
 		66586D3629005A1B00DDA9B9 /* story_viewer_onboarding_3.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = story_viewer_onboarding_3.json; sourceTree = "<group>"; };
 		66586D4029009C0000DDA9B9 /* TextAttachment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextAttachment.swift; sourceTree = "<group>"; };
-		6659A0252A7C11A800066AB7 /* PrekeyManagerImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrekeyManagerImpl.swift; sourceTree = "<group>"; };
+		6659A0252A7C11A800066AB7 /* PreKeyManagerImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreKeyManagerImpl.swift; sourceTree = "<group>"; };
 		6659A0272A7C11ED00066AB7 /* MockPreKeyManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockPreKeyManager.swift; sourceTree = "<group>"; };
 		6659A0302A7C5B9700066AB7 /* PreKeyUploadBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreKeyUploadBundle.swift; sourceTree = "<group>"; };
 		6659A0382A81933B00066AB7 /* ProvisioningPermissionsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProvisioningPermissionsViewController.swift; sourceTree = "<group>"; };
@@ -10297,20 +10297,6 @@
 			path = WhoAmI;
 			sourceTree = "<group>";
 		};
-		6659A0242A7C112700066AB7 /* PreKeys */ = {
-			isa = PBXGroup;
-			children = (
-				6659A0272A7C11ED00066AB7 /* MockPreKeyManager.swift */,
-				F9C5C9C2289453B100548EEE /* PreKeyManager.swift */,
-				6659A0252A7C11A800066AB7 /* PrekeyManagerImpl.swift */,
-				C17345BA2A5E000300C6426D /* PreKeyTarget.swift */,
-				D94AEB3B2D28940500B03D7A /* PreKeyTaskAPIClient.swift */,
-				C1ED5CA02A72E3D5009AD3FC /* PreKeyTaskManager.swift */,
-				6659A0302A7C5B9700066AB7 /* PreKeyUploadBundle.swift */,
-			);
-			path = PreKeys;
-			sourceTree = "<group>";
-		};
 		6659A02D2A7C171900066AB7 /* PreKeys */ = {
 			isa = PBXGroup;
 			children = (
@@ -14591,6 +14577,7 @@
 				D92EFDEB2F68EB7D0031D257 /* AttachmentBackfill */,
 				7255A4C32B98D5A800E95368 /* Attachments */,
 				720547F12B9C8F5E00E2CF2F /* Avatars */,
+				F9C5CA52289453B100548EEE /* Axolotl */,
 				665C0D5A2ADF537000539A37 /* Backups */,
 				F945FE482984795A00C835C7 /* Calls */,
 				D9C2D78529A80BE700D79715 /* ChangePhoneNumber */,
@@ -14624,7 +14611,6 @@
 				046092252FBCD28300A8765F /* SafetyTips */,
 				50B791552E8B39230063E71E /* Search */,
 				6673FF6A2978B5B900F96CFD /* SecureValueRecovery */,
-				F9C5CB98289453B200548EEE /* Security */,
 				F9C5CAB4289453B200548EEE /* Spam */,
 				F9C5CA2F289453B100548EEE /* Storage */,
 				88E34F2522F269B600966CC2 /* StorageService */,
@@ -15025,7 +15011,6 @@
 			isa = PBXGroup;
 			children = (
 				6646572F2AC369EB0099DE1C /* PhoneNumberDiscoverabilityManager */,
-				6659A0242A7C112700066AB7 /* PreKeys */,
 				661170BF2ABA458800A1B16D /* TSAccountManager */,
 				C18D6FDF2D4D8FB40085E3B9 /* AccountEntropyPool.swift */,
 				D9EDF2772E4D2A1E001D4BEC /* AccountEntropyPoolManager.swift */,
@@ -15165,7 +15150,6 @@
 		F9C5CA2F289453B100548EEE /* Storage */ = {
 			isa = PBXGroup;
 			children = (
-				F9C5CA52289453B100548EEE /* AxolotlStore */,
 				F9C5CA31289453B100548EEE /* Database */,
 				667DEE562BC7148E00EFF32D /* MediaGallery */,
 				F9C5CA9B289453B100548EEE /* BaseModel.h */,
@@ -15234,30 +15218,33 @@
 			path = Snapshots;
 			sourceTree = "<group>";
 		};
-		F9C5CA52289453B100548EEE /* AxolotlStore */ = {
+		F9C5CA52289453B100548EEE /* Axolotl */ = {
 			isa = PBXGroup;
 			children = (
-				F9C5CA5F289453B100548EEE /* Model */,
+				667664352A43BBCD00716B84 /* CombinedFingerprints.swift */,
+				50A156C62FA11AA8008FE086 /* Fingerprint.swift */,
 				C198FDD52A37C905000BCAC9 /* KyberPreKeyStoreImpl.swift */,
 				504F98B02EAFFAC600DF465B /* KyberPreKeyUseRecord.swift */,
+				6659A0272A7C11ED00066AB7 /* MockPreKeyManager.swift */,
 				F9C5CA59289453B100548EEE /* OldSenderKeyStore.swift */,
+				F9C5CB9F289453B200548EEE /* OWSRecipientIdentity.swift */,
+				F9C5CB99289453B200548EEE /* OWSVerificationState.h */,
+				5010B6B32C6BD41E00314CD4 /* PreKeyBundle.swift */,
 				5050A8782B76E2E100E9BFA4 /* PreKeyId.swift */,
+				F9C5C9C2289453B100548EEE /* PreKeyManager.swift */,
+				6659A0252A7C11A800066AB7 /* PreKeyManagerImpl.swift */,
 				50589CDF2E8C4AD5003EF42A /* PreKeyRecord.swift */,
 				50589CDD2E8C44D5003EF42A /* PreKeyStore.swift */,
 				F9C5CA75289453B100548EEE /* PreKeyStoreImpl.swift */,
+				C17345BA2A5E000300C6426D /* PreKeyTarget.swift */,
+				D94AEB3B2D28940500B03D7A /* PreKeyTaskAPIClient.swift */,
+				C1ED5CA02A72E3D5009AD3FC /* PreKeyTaskManager.swift */,
+				6659A0302A7C5B9700066AB7 /* PreKeyUploadBundle.swift */,
 				501050BA2EB959A4005161CA /* SessionStore.swift */,
 				F9C5CA56289453B100548EEE /* SignalProtocolStore.swift */,
 				F9C5CA55289453B100548EEE /* SignedPreKeyStoreImpl.swift */,
 			);
-			path = AxolotlStore;
-			sourceTree = "<group>";
-		};
-		F9C5CA5F289453B100548EEE /* Model */ = {
-			isa = PBXGroup;
-			children = (
-				5010B6B32C6BD41E00314CD4 /* PreKeyBundle.swift */,
-			);
-			path = Model;
+			path = Axolotl;
 			sourceTree = "<group>";
 		};
 		F9C5CA85289453B100548EEE /* JobRecords */ = {
@@ -15306,10 +15293,12 @@
 				F9C5CAD3289453B200548EEE /* API */,
 				88DF819328E112F600F8BA80 /* SignalProxy */,
 				669E8FE528B4149200043D28 /* BaseOWSURLSessionMock.swift */,
+				727328062CA6CF530080E2C7 /* Certificates.swift */,
 				F9C5CAC4289453B200548EEE /* ChatConnectionManager.swift */,
 				509A8DC12E25817E0024BF14 /* ConnectionLock.swift */,
 				F9C5CAF7289453B200548EEE /* ContentProxy.swift */,
 				F9C5CAF2289453B200548EEE /* HttpHeaders.swift */,
+				727328042CA6619A0080E2C7 /* HttpSecurityPolicy.swift */,
 				F9C5CAF1289453B200548EEE /* NetworkInterfaceSet.swift */,
 				F9C5CAC8289453B200548EEE /* OutageDetection.swift */,
 				72328C8A2C6C7322000EA728 /* OWSCensorshipConfiguration.swift */,
@@ -15536,19 +15525,6 @@
 			path = TestUtils;
 			sourceTree = "<group>";
 		};
-		F9C5CB98289453B200548EEE /* Security */ = {
-			isa = PBXGroup;
-			children = (
-				727328062CA6CF530080E2C7 /* Certificates.swift */,
-				667664352A43BBCD00716B84 /* CombinedFingerprints.swift */,
-				50A156C62FA11AA8008FE086 /* Fingerprint.swift */,
-				727328042CA6619A0080E2C7 /* HttpSecurityPolicy.swift */,
-				F9C5CB9F289453B200548EEE /* OWSRecipientIdentity.swift */,
-				F9C5CB99289453B200548EEE /* OWSVerificationState.h */,
-			);
-			path = Security;
-			sourceTree = "<group>";
-		};
 		F9C5CBA3289453B200548EEE /* Groups */ = {
 			isa = PBXGroup;
 			children = (
@@ -19682,7 +19658,7 @@
 				5010B6B42C6BD41E00314CD4 /* PreKeyBundle.swift in Sources */,
 				5050A8792B76E2E100E9BFA4 /* PreKeyId.swift in Sources */,
 				F9C5CCAC289453B300548EEE /* PreKeyManager.swift in Sources */,
-				6659A0262A7C11A800066AB7 /* PrekeyManagerImpl.swift in Sources */,
+				6659A0262A7C11A800066AB7 /* PreKeyManagerImpl.swift in Sources */,
 				50589CE02E8C4AD5003EF42A /* PreKeyRecord.swift in Sources */,
 				50589CDE2E8C44D5003EF42A /* PreKeyStore.swift in Sources */,
 				F9C5CD52289453B300548EEE /* PreKeyStoreImpl.swift in Sources */,