From 5f5ec9b82ade82a1e285b34fdb379e82e4576442 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Mon, 29 Oct 2018 12:11:06 -0600
Subject: [PATCH] ExceptionWrap loadPreKey

---
 .../Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m  | 2 +-
 .../AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.m    | 2 +-
 .../tests/Storage/TSStoragePreKeyStoreTests.m             | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m
index b5622c48f..41e83f7da 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m
@@ -49,7 +49,7 @@
     }
 }
 
-- (PreKeyRecord *)loadPreKey:(int)preKeyId
+- (PreKeyRecord *)try_loadPreKey:(int)preKeyId
 {
     PreKeyRecord *preKeyRecord = [self.dbReadConnection preKeyRecordForKey:[self keyFromInt:preKeyId]
                                                               inCollection:OWSPrimaryStoragePreKeyStoreCollection];
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.m b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.m
index 48eef0a75..423cd3e7a 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.m
@@ -36,7 +36,7 @@ NSString *const OWSPrimaryStorageKeyPrekeyCurrentSignedPrekeyId = @"currentSigne
         generatedAt:[NSDate date]];
 }
 
-- (SignedPreKeyRecord *)loadSignedPrekey:(int)signedPreKeyId
+- (SignedPreKeyRecord *)try_loadSignedPrekey:(int)signedPreKeyId
 {
     SignedPreKeyRecord *preKeyRecord =
         [self.dbReadConnection signedPreKeyRecordForKey:[self keyFromInt:signedPreKeyId]
diff --git a/SignalServiceKit/tests/Storage/TSStoragePreKeyStoreTests.m b/SignalServiceKit/tests/Storage/TSStoragePreKeyStoreTests.m
index ad98a0a33..906daaa2a 100644
--- a/SignalServiceKit/tests/Storage/TSStoragePreKeyStoreTests.m
+++ b/SignalServiceKit/tests/Storage/TSStoragePreKeyStoreTests.m
@@ -35,10 +35,10 @@
     PreKeyRecord *lastPreKeyRecord = [generatedKeys lastObject];
     PreKeyRecord *firstPreKeyRecord = [generatedKeys firstObject];
 
-    XCTAssert([[[OWSPrimaryStorage sharedManager] loadPreKey:lastPreKeyRecord.Id].keyPair.publicKey
+    XCTAssert([[[OWSPrimaryStorage sharedManager] try_loadPreKey:lastPreKeyRecord.Id].keyPair.publicKey
         isEqualToData:lastPreKeyRecord.keyPair.publicKey]);
 
-    XCTAssert([[[OWSPrimaryStorage sharedManager] loadPreKey:firstPreKeyRecord.Id].keyPair.publicKey
+    XCTAssert([[[OWSPrimaryStorage sharedManager] try_loadPreKey:firstPreKeyRecord.Id].keyPair.publicKey
         isEqualToData:firstPreKeyRecord.keyPair.publicKey]);
 }
 
@@ -56,8 +56,8 @@
 
     [[OWSPrimaryStorage sharedManager] removePreKey:lastPreKeyRecord.Id];
 
-    XCTAssertThrows([[OWSPrimaryStorage sharedManager] loadPreKey:lastPreKeyRecord.Id]);
-    XCTAssertNoThrow([[OWSPrimaryStorage sharedManager] loadPreKey:firstPreKeyRecord.Id]);
+    XCTAssertThrows([[OWSPrimaryStorage sharedManager] try_loadPreKey:lastPreKeyRecord.Id]);
+    XCTAssertNoThrow([[OWSPrimaryStorage sharedManager] try_loadPreKey:firstPreKeyRecord.Id]);
 }
 
 @end