Merge branch 'mkirk/fixup-tests-1'

This commit is contained in:
Michael Kirk 2020-03-10 11:38:42 -06:00
commit 3fcb31137b

View File

@ -81,7 +81,7 @@ class MockClient: NSObject {
func generateMockPreKey() -> PreKeyRecord {
let preKeyId: Int32 = Int32(arc4random_uniform(UInt32(INT32_MAX)))
let keyPair = Curve25519.generateKeyPair()
let preKey = PreKeyRecord(id: preKeyId, keyPair: keyPair, createdAt: Date())!
let preKey = PreKeyRecord(id: preKeyId, keyPair: keyPair, createdAt: Date())
self.preKeyStore.storePreKey(preKeyId, preKeyRecord: preKey)
return preKey
}
@ -92,7 +92,7 @@ class MockClient: NSObject {
let generatedAt = Date()
let identityKeyPair = self.identityStore.identityKeyPair(nil)!
let signature = try! Ed25519.sign((keyPair.publicKey as NSData).prependKeyType() as Data, with: identityKeyPair)
let signedPreKey = SignedPreKeyRecord(id: signedPreKeyId, keyPair: keyPair, signature: signature, generatedAt: generatedAt)!
let signedPreKey = SignedPreKeyRecord(id: signedPreKeyId, keyPair: keyPair, signature: signature, generatedAt: generatedAt)
self.signedPreKeyStore.storeSignedPreKey(signedPreKeyId, signedPreKeyRecord: signedPreKey)
return signedPreKey
}