CR: rename AxolotlInMemoryStore -> SPKMockProtocolStore

Author: michaelkirk

AxolotlKit/Classes/SPK-Bridging-Header.h

@@ -2,8 +2,8 @@
 //  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
-#import <AxolotlKit/AxolotlInMemoryStore.h>
 #import <AxolotlKit/AxolotlStore.h>
+#import <AxolotlKit/SPKMockProtocolStore.h>
 #import <Curve25519Kit/Curve25519.h>
 #import <SignalCoreKit/NSObject+OWS.h>
 #import <SignalCoreKit/OWSAsserts.h>

AxolotlKit/Classes/TestUtils/AxolotlInMemoryStore.h renamed to AxolotlKit/Classes/TestUtils/SPKMockProtocolStore.h

@@ -6,7 +6,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface AxolotlInMemoryStore : NSObject <AxolotlStore>
+@interface SPKMockProtocolStore : NSObject <AxolotlStore>
 
 - (instancetype)initWithIdentityKeyPair:(ECKeyPair *)identityKeyPair
                     localRegistrationId:(int)localRegistrationId NS_DESIGNATED_INITIALIZER;

AxolotlKit/Classes/TestUtils/AxolotlInMemoryStore.m renamed to AxolotlKit/Classes/TestUtils/SPKMockProtocolStore.m

@@ -2,12 +2,12 @@
 //  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
-#import "AxolotlInMemoryStore.h"
+#import "SPKMockProtocolStore.h"
 #import "AxolotlExceptions.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface AxolotlInMemoryStore ()
+@interface SPKMockProtocolStore ()
 
 @property NSMutableDictionary<NSString *, NSMutableDictionary *> *sessionRecords;
 
@@ -23,7 +23,7 @@ @interface AxolotlInMemoryStore ()
 
 @end
 
-@implementation AxolotlInMemoryStore
+@implementation SPKMockProtocolStore
 
 
 #pragma mark General

AxolotlKitTests/RatchetingSessionTest.m

@@ -4,10 +4,10 @@
 
 #import "ECKeyPair+ECKeyPairTesting.h"
 #import <AxolotlKit/AliceAxolotlParameters.h>
-#import <AxolotlKit/AxolotlInMemoryStore.h>
 #import <AxolotlKit/BobAxolotlParameters.h>
 #import <AxolotlKit/ChainKey.h>
 #import <AxolotlKit/RatchetingSession.h>
+#import <AxolotlKit/SPKMockProtocolStore.h>
 #import <AxolotlKit/SessionCipher.h>
 #import <AxolotlKit/SessionRecord.h>
 #import <AxolotlKit/SessionState.h>
@@ -315,8 +315,8 @@ - (void)testSessionInitializationAndRatcheting {
 
     // ---
 
-    AxolotlInMemoryStore *aliceStore = [AxolotlInMemoryStore new];
-    AxolotlInMemoryStore *bobStore = [AxolotlInMemoryStore new];
+    SPKMockProtocolStore *aliceStore = [SPKMockProtocolStore new];
+    SPKMockProtocolStore *bobStore = [SPKMockProtocolStore new];
 
     SessionRecord *aliceSessionRecord = [SessionRecord new];
     SessionRecord *bobSessionRecord   = [SessionRecord new];
@@ -677,8 +677,8 @@ - (void)testOutOfOrderReceives {
 
     // ---
 
-    AxolotlInMemoryStore *aliceStore = [AxolotlInMemoryStore new];
-    AxolotlInMemoryStore *bobStore = [AxolotlInMemoryStore new];
+    SPKMockProtocolStore *aliceStore = [SPKMockProtocolStore new];
+    SPKMockProtocolStore *bobStore = [SPKMockProtocolStore new];
 
     SessionRecord *aliceSessionRecord = [SessionRecord new];
     SessionRecord *bobSessionRecord   = [SessionRecord new];

AxolotlKitTests/SessionBuilderTests.m

@@ -3,8 +3,8 @@
 //
 
 #import <AxolotlKit/AxolotlExceptions.h>
-#import <AxolotlKit/AxolotlInMemoryStore.h>
 #import <AxolotlKit/NSData+keyVersionByte.h>
+#import <AxolotlKit/SPKMockProtocolStore.h>
 #import <AxolotlKit/SessionBuilder.h>
 #import <AxolotlKit/SessionCipher.h>
 #import <Curve25519Kit/Ed25519.h>
@@ -47,10 +47,10 @@ - (void)testBasicPreKey {
     NSString *BOB_RECIPIENT_ID   = @"+3828923892";
     NSString *ALICE_RECIPIENT_ID = @"alice@gmail.com";
 
-    AxolotlInMemoryStore *aliceStore = [AxolotlInMemoryStore new];
+    SPKMockProtocolStore *aliceStore = [SPKMockProtocolStore new];
     SessionBuilder       *aliceSessionBuilder = [[SessionBuilder alloc] initWithAxolotlStore:aliceStore recipientId:BOB_RECIPIENT_ID deviceId:1];
 
-    AxolotlInMemoryStore *bobStore      = [AxolotlInMemoryStore new];
+    SPKMockProtocolStore *bobStore      = [SPKMockProtocolStore new];
     ECKeyPair *bobPreKeyPair            = [Curve25519 generateKeyPair];
     ECKeyPair *bobSignedPreKeyPair      = [Curve25519 generateKeyPair];
     NSData *bobSignedPreKeySignature =
@@ -99,10 +99,10 @@ - (void)testBasicPreKeyMITM {
 
     NSString *BOB_RECIPIENT_ID   = @"+3828923892";
 
-    AxolotlInMemoryStore *aliceStore = [AxolotlInMemoryStore new];
+    SPKMockProtocolStore *aliceStore = [SPKMockProtocolStore new];
     SessionBuilder       *aliceSessionBuilder = [[SessionBuilder alloc] initWithAxolotlStore:aliceStore recipientId:BOB_RECIPIENT_ID deviceId:1];
 
-    AxolotlInMemoryStore *bobStore      = [AxolotlInMemoryStore new];
+    SPKMockProtocolStore *bobStore      = [SPKMockProtocolStore new];
     ECKeyPair *bobIdentityKeyPair1 = [Curve25519 generateKeyPair];
     ECKeyPair *bobPreKeyPair1 = [Curve25519 generateKeyPair];
     ECKeyPair *bobSignedPreKeyPair1 = [Curve25519 generateKeyPair];

AxolotlKitTests/SessionCipherTest.m

@@ -3,10 +3,10 @@
 //
 
 #import <AxolotlKit/AliceAxolotlParameters.h>
-#import <AxolotlKit/AxolotlInMemoryStore.h>
 #import <AxolotlKit/BobAxolotlParameters.h>
 #import <AxolotlKit/ChainKey.h>
 #import <AxolotlKit/RatchetingSession.h>
+#import <AxolotlKit/SPKMockProtocolStore.h>
 #import <AxolotlKit/SessionBuilder.h>
 #import <AxolotlKit/SessionCipher.h>
 #import <AxolotlKit/SessionState.h>
@@ -17,8 +17,8 @@ @interface SessionCipherTest : XCTestCase
 
 @property (nonatomic, readonly) NSString *aliceIdentifier;
 @property (nonatomic, readonly) NSString *bobIdentifier;
-@property (nonatomic, readonly) AxolotlInMemoryStore *aliceStore;
-@property (nonatomic, readonly) AxolotlInMemoryStore *bobStore;
+@property (nonatomic, readonly) SPKMockProtocolStore *aliceStore;
+@property (nonatomic, readonly) SPKMockProtocolStore *bobStore;
 
 @end
 
@@ -36,8 +36,8 @@ - (NSString *)bobIdentifier
 
 - (void)setUp {
     [super setUp];
-    _aliceStore = [AxolotlInMemoryStore new];
-    _bobStore = [AxolotlInMemoryStore new];
+    _aliceStore = [SPKMockProtocolStore new];
+    _bobStore = [SPKMockProtocolStore new];
 }
 
 - (void)tearDown {