Merge branch 'charlesmchen/fixBrokenTests'

Author: charlesmchen-signal

AxolotlKitTests/SessionBuilderTests.m

@@ -80,7 +80,9 @@ - (void)testBasicPreKey {
     XCTAssert([outgoingMessage isKindOfClass:[PreKeyWhisperMessage class]], @"Message should be PreKey type");
 
     PreKeyWhisperMessage *incomingMessage = (PreKeyWhisperMessage*)outgoingMessage;
-    [bobStore storePreKey:31337 preKeyRecord:[[PreKeyRecord alloc] initWithId:bobPreKey.preKeyId keyPair:bobPreKeyPair]];
+    [bobStore storePreKey:31337 preKeyRecord:[[PreKeyRecord alloc] initWithId:bobPreKey.preKeyId
+                                                                      keyPair:bobPreKeyPair
+                                                                    createdAt:[NSDate date]]];
     [bobStore storeSignedPreKey:22 signedPreKeyRecord:[[SignedPreKeyRecord alloc] initWithId:22 keyPair:bobSignedPreKeyPair signature:bobSignedPreKeySignature generatedAt:[NSDate date]]];
 
     SessionCipher *bobSessionCipher = [[SessionCipher alloc] initWithAxolotlStore:bobStore recipientId:ALICE_RECIPIENT_ID deviceId:1];

AxolotlKitTests/Util/ECKeyPair+ECKeyPairTesting.m

@@ -7,14 +7,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface ECKeyPair (ECKeyPairTestingPrivate)
-
-- (nullable id)initWithPublicKey:(NSData *)publicKey privateKey:(NSData *)privateKey;
-
-@end
-
-#pragma mark -
-
 @implementation ECKeyPair (testing)
 
 + (ECKeyPair *)throws_keyPairWithPrivateKey:(NSData *)privateKey publicKey:(NSData *)publicKey
@@ -27,7 +19,9 @@ + (ECKeyPair *)throws_keyPairWithPrivateKey:(NSData *)privateKey publicKey:(NSDa
         @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Public or Private key is not required size" userInfo:@{@"PrivateKey":privateKey, @"Public Key":publicKey}];
     }
 
-    ECKeyPair *keyPairCopy = [[ECKeyPair alloc] initWithPublicKey:[publicKey copy] privateKey:[privateKey copy]];
+    NSError *error;
+    ECKeyPair *_Nullable keyPairCopy = [[ECKeyPair alloc] initWithPublicKeyData:[publicKey copy] privateKeyData:[privateKey copy] error:&error];
+    OWSAssertDebug(error == nil && keyPairCopy != nil);
     return keyPairCopy;
 }