Port `SnapshotVersion` for the rest Firestore modulo (#1185)

* remove conversions in `Local` and `Remote`

* replace `FSTSnapshotVersion` in `Model`

* replace `FSTSnapshotVersion` in the rest

* let test check equal with C++ equal

* fix newly added code

* address changes

3 files changed, 16 insertions, 14 deletions

diff --git a/Firestore/Example/Tests/Local/FSTLocalSerializerTests.mm b/Firestore/Example/Tests/Local/FSTLocalSerializerTests.mm
index 362f46f..421f244 100644
--- a/Firestore/Example/Tests/Local/FSTLocalSerializerTests.mm
+++ b/Firestore/Example/Tests/Local/FSTLocalSerializerTests.mm
@@ -29,7 +29,6 @@
 #import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h"
 #import "Firestore/Protos/objc/google/type/Latlng.pbobjc.h"
 #import "Firestore/Source/Core/FSTQuery.h"
-#import "Firestore/Source/Core/FSTSnapshotVersion.h"
 #import "Firestore/Source/Local/FSTQueryData.h"
 #import "Firestore/Source/Model/FSTDocument.h"
 #import "Firestore/Source/Model/FSTDocumentKey.h"
@@ -50,6 +49,7 @@ namespace testutil = firebase::firestore::testutil;
 using firebase::firestore::model::DatabaseId;
 using firebase::firestore::model::FieldMask;
 using firebase::firestore::model::Precondition;
+using firebase::firestore::model::SnapshotVersion;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -162,7 +162,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)testEncodesQueryData {
   FSTQuery *query = FSTTestQuery("room");
   FSTTargetID targetID = 42;
-  FSTSnapshotVersion *version = FSTTestVersion(1039);
+  SnapshotVersion version = testutil::Version(1039);
   NSData *resumeToken = FSTTestResumeTokenFromSnapshotVersion(1039);
 
   FSTQueryData *queryData = [[FSTQueryData alloc] initWithQuery:query
diff --git a/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm b/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm
index 3565e2e..6c7fb3d 100644
--- a/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm
+++ b/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm
@@ -41,8 +41,11 @@
 #import "Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.h"
 
 #include "Firestore/core/src/firebase/firestore/auth/user.h"
+#include "Firestore/core/test/firebase/firestore/testutil/testutil.h"
 
+namespace testutil = firebase::firestore::testutil;
 using firebase::firestore::auth::User;
+using firebase::firestore::model::SnapshotVersion;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -50,7 +53,7 @@ NS_ASSUME_NONNULL_BEGIN
 FSTDocumentVersionDictionary *FSTVersionDictionary(FSTMutation *mutation,
                                                    FSTTestSnapshotVersion version) {
   FSTDocumentVersionDictionary *result = [FSTDocumentVersionDictionary documentVersionDictionary];
-  result = [result dictionaryBySettingObject:FSTTestVersion(version) forKey:mutation.key];
+  result = [result dictionaryBySettingObject:testutil::Version(version) forKey:mutation.key];
   return result;
 }
 
@@ -140,7 +143,7 @@ FSTDocumentVersionDictionary *FSTVersionDictionary(FSTMutation *mutation,
   FSTMutationBatch *batch = [self.batches firstObject];
   [self.batches removeObjectAtIndex:0];
   XCTAssertEqual(batch.mutations.count, 1, @"Acknowledging more than one mutation not supported.");
-  FSTSnapshotVersion *version = FSTTestVersion(documentVersion);
+  SnapshotVersion version = testutil::Version(documentVersion);
   FSTMutationResult *mutationResult =
       [[FSTMutationResult alloc] initWithVersion:version transformResults:nil];
   FSTMutationBatchResult *result = [FSTMutationBatchResult resultWithBatch:batch
@@ -818,7 +821,7 @@ FSTDocumentVersionDictionary *FSTVersionDictionary(FSTMutation *mutation,
   NSMutableDictionary<FSTBoxedTargetID *, NSNumber *> *pendingResponses =
       [NSMutableDictionary dictionary];
   FSTWatchChangeAggregator *aggregator =
-      [[FSTWatchChangeAggregator alloc] initWithSnapshotVersion:FSTTestVersion(1000)
+      [[FSTWatchChangeAggregator alloc] initWithSnapshotVersion:testutil::Version(1000)
                                                   listenTargets:listens
                                          pendingTargetResponses:pendingResponses];
   [aggregator addWatchChanges:@[ watchChange ]];
diff --git a/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm b/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm
index 429a83a..5d07516 100644
--- a/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm
+++ b/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm
@@ -19,7 +19,6 @@
 #include <set>
 
 #import "Firestore/Source/Core/FSTQuery.h"
-#import "Firestore/Source/Core/FSTSnapshotVersion.h"
 #import "Firestore/Source/Local/FSTEagerGarbageCollector.h"
 #import "Firestore/Source/Local/FSTPersistence.h"
 #import "Firestore/Source/Local/FSTQueryData.h"
@@ -32,6 +31,7 @@
 
 namespace testutil = firebase::firestore::testutil;
 using firebase::firestore::model::DocumentKey;
+using firebase::firestore::model::SnapshotVersion;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -130,9 +130,9 @@ NS_ASSUME_NONNULL_BEGIN
 
     FSTQueryData *result = [self.queryCache queryDataForQuery:_queryRooms];
     XCTAssertNotEqualObjects(queryData2.resumeToken, queryData1.resumeToken);
-    XCTAssertNotEqualObjects(queryData2.snapshotVersion, queryData1.snapshotVersion);
+    XCTAssertNotEqual(queryData2.snapshotVersion, queryData1.snapshotVersion);
     XCTAssertEqualObjects(result.resumeToken, queryData2.resumeToken);
-    XCTAssertEqualObjects(result.snapshotVersion, queryData2.snapshotVersion);
+    XCTAssertEqual(result.snapshotVersion, queryData2.snapshotVersion);
   });
 }
 
@@ -386,19 +386,18 @@ NS_ASSUME_NONNULL_BEGIN
   if ([self isTestBaseClass]) return;
 
   self.persistence.run("testLastRemoteSnapshotVersion", [&]() {
-    XCTAssertEqualObjects([self.queryCache lastRemoteSnapshotVersion],
-                          [FSTSnapshotVersion noVersion]);
+    XCTAssertEqual([self.queryCache lastRemoteSnapshotVersion], SnapshotVersion::None());
 
     // Can set the snapshot version.
-    [self.queryCache setLastRemoteSnapshotVersion:FSTTestVersion(42)];
-    XCTAssertEqualObjects([self.queryCache lastRemoteSnapshotVersion], FSTTestVersion(42));
+    [self.queryCache setLastRemoteSnapshotVersion:testutil::Version(42)];
+    XCTAssertEqual([self.queryCache lastRemoteSnapshotVersion], testutil::Version(42));
   });
 
   // Snapshot version persists restarts.
   self.queryCache = [self.persistence queryCache];
   self.persistence.run("testLastRemoteSnapshotVersion restart", [&]() {
     [self.queryCache start];
-    XCTAssertEqualObjects([self.queryCache lastRemoteSnapshotVersion], FSTTestVersion(42));
+    XCTAssertEqual([self.queryCache lastRemoteSnapshotVersion], testutil::Version(42));
   });
 }
 
@@ -424,7 +423,7 @@ NS_ASSUME_NONNULL_BEGIN
                                     targetID:targetID
                         listenSequenceNumber:sequenceNumber
                                      purpose:FSTQueryPurposeListen
-                             snapshotVersion:FSTTestVersion(version)
+                             snapshotVersion:testutil::Version(version)
                                  resumeToken:resumeToken];
 }