Use protocol contexts in prekey stores.

Author: charlesmchen-signal

AxolotlKit/Classes/Sessions/SessionBuilder.m

@@ -211,10 +211,13 @@ - (int)throws_processPrekeyV3:(PreKeyWhisperMessage *)message
     SignedPreKeyRecord *_Nullable signedPreKeyRecord = [self.signedPreKeyStore loadSignedPreKey:message.signedPrekeyId
                                                                                 protocolContext:protocolContext];
     if (signedPreKeyRecord == nil) {
-        DDLogWarn(@"%@ Signed prekey id: %lu, prekey id: %lu.", self.tag,
+        OWSLogWarn(@"Signed prekey id: %lu, prekey id: %lu.",
                   (unsigned long) message.signedPrekeyId,
                   (unsigned long) message.prekeyID);
-        OWSRaiseException(InvalidKeyIdException, @"No signed pre key found matching key id");
+        OWSLogWarn(@"Available signed prekey ids: %@",
+                  [self.signedPreKeyStore availableSignedPreKeyIdsWithProtocolContext:protocolContext]);
+
+        OWSRaiseException(InvalidKeyIdException, @"No signed prekey found matching key id");
     }
     ECKeyPair *ourSignedPrekey = signedPreKeyRecord.keyPair;
 

AxolotlKit/Classes/State/SignedPreKeyStore.h

@@ -24,6 +24,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)removeSignedPreKey:(int)signedPreKeyId
            protocolContext:(nullable id<SPKProtocolWriteContext>)protocolContext;
 
+- (NSArray<NSString *> *)availableSignedPreKeyIdsWithProtocolContext:(nullable id<SPKProtocolReadContext>)protocolContext;
+
 @end
 
 NS_ASSUME_NONNULL_END

AxolotlKit/Classes/TestUtils/SPKMockProtocolStore.m

@@ -69,6 +69,11 @@ - (nullable SignedPreKeyRecord *)loadSignedPreKey:(int)signedPreKeyId
     return results;
 }
 
+- (NSArray<NSString *> *)availableSignedPreKeyIdsWithProtocolContext:(nullable id<SPKProtocolReadContext>)protocolContext
+{
+    return @[];
+}
+
 - (void)storeSignedPreKey:(int)signedPreKeyId
        signedPreKeyRecord:(SignedPreKeyRecord *)signedPreKeyRecord
           protocolContext:(nullable id<SPKProtocolWriteContext>)protocolContext