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

2 files changed, 19 insertions, 19 deletions

diff --git a/Firestore/Example/Tests/Model/FSTDocumentTests.mm b/Firestore/Example/Tests/Model/FSTDocumentTests.mm
index 24858c5..4e3517c 100644
--- a/Firestore/Example/Tests/Model/FSTDocumentTests.mm
+++ b/Firestore/Example/Tests/Model/FSTDocumentTests.mm
@@ -18,7 +18,6 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Firestore/Source/Core/FSTSnapshotVersion.h"
 #import "Firestore/Source/Model/FSTFieldValue.h"
 
 #import "Firestore/Example/Tests/Util/FSTHelpers.h"
@@ -28,6 +27,7 @@
 
 namespace testutil = firebase::firestore::testutil;
 using firebase::firestore::model::DocumentKey;
+using firebase::firestore::model::SnapshotVersion;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -38,20 +38,20 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)testConstructor {
   DocumentKey key = testutil::Key("messages/first");
-  FSTSnapshotVersion *version = FSTTestVersion(1);
+  SnapshotVersion version = testutil::Version(1);
   FSTObjectValue *data = FSTTestObjectValue(@{ @"a" : @1 });
   FSTDocument *doc =
       [FSTDocument documentWithData:data key:key version:version hasLocalMutations:NO];
 
   XCTAssertEqualObjects(doc.key, FSTTestDocKey(@"messages/first"));
-  XCTAssertEqualObjects(doc.version, version);
+  XCTAssertEqual(doc.version, version);
   XCTAssertEqualObjects(doc.data, data);
   XCTAssertEqual(doc.hasLocalMutations, NO);
 }
 
 - (void)testExtractsFields {
   DocumentKey key = testutil::Key("rooms/eros");
-  FSTSnapshotVersion *version = FSTTestVersion(1);
+  SnapshotVersion version = testutil::Version(1);
   FSTObjectValue *data = FSTTestObjectValue(@{
     @"desc" : @"Discuss all the project related stuff",
     @"owner" : @{@"name" : @"Jonny", @"title" : @"scallywag"}
diff --git a/Firestore/Example/Tests/Model/FSTMutationTests.mm b/Firestore/Example/Tests/Model/FSTMutationTests.mm
index 936bd38..b9f98ce 100644
--- a/Firestore/Example/Tests/Model/FSTMutationTests.mm
+++ b/Firestore/Example/Tests/Model/FSTMutationTests.mm
@@ -135,7 +135,7 @@ using firebase::firestore::model::TransformOperation;
 
   FSTDocument *expectedDoc = [FSTDocument documentWithData:expectedData
                                                        key:FSTTestDocKey(@"collection/key")
-                                                   version:FSTTestVersion(0)
+                                                   version:testutil::Version(0)
                                          hasLocalMutations:YES];
 
   XCTAssertEqualObjects(transformedDoc, expectedDoc);
@@ -301,7 +301,7 @@ using firebase::firestore::model::TransformOperation;
 
   FSTDocument *expectedDoc = [FSTDocument documentWithData:FSTTestObjectValue(expectedData)
                                                        key:FSTTestDocKey(@"collection/key")
-                                                   version:FSTTestVersion(0)
+                                                   version:testutil::Version(0)
                                          hasLocalMutations:YES];
 
   XCTAssertEqualObjects(transformedDoc, expectedDoc);
@@ -315,7 +315,7 @@ using firebase::firestore::model::TransformOperation;
       @"collection/key", @{@"foo.bar" : [FIRFieldValue fieldValueForServerTimestamp]});
 
   FSTMutationResult *mutationResult = [[FSTMutationResult alloc]
-       initWithVersion:FSTTestVersion(1)
+       initWithVersion:testutil::Version(1)
       transformResults:@[ [FSTTimestampValue timestampValue:_timestamp] ]];
 
   FSTMaybeDocument *transformedDoc = [transform applyTo:baseDoc
@@ -340,7 +340,7 @@ using firebase::firestore::model::TransformOperation;
 
   // Server just sends null transform results for array operations.
   FSTMutationResult *mutationResult = [[FSTMutationResult alloc]
-       initWithVersion:FSTTestVersion(1)
+       initWithVersion:testutil::Version(1)
       transformResults:@[ [FSTNullValue nullValue], [FSTNullValue nullValue] ]];
 
   FSTMaybeDocument *transformedDoc = [transform applyTo:baseDoc
@@ -368,7 +368,7 @@ using firebase::firestore::model::TransformOperation;
 
   FSTMutation *set = FSTTestSetMutation(@"collection/key", @{@"foo" : @"new-bar"});
   FSTMutationResult *mutationResult =
-      [[FSTMutationResult alloc] initWithVersion:FSTTestVersion(4) transformResults:nil];
+      [[FSTMutationResult alloc] initWithVersion:testutil::Version(4) transformResults:nil];
   FSTMaybeDocument *setDoc = [set applyTo:baseDoc
                              baseDocument:baseDoc
                            localWriteTime:_timestamp
@@ -384,7 +384,7 @@ using firebase::firestore::model::TransformOperation;
 
   FSTMutation *patch = FSTTestPatchMutation("collection/key", @{@"foo" : @"new-bar"}, {});
   FSTMutationResult *mutationResult =
-      [[FSTMutationResult alloc] initWithVersion:FSTTestVersion(4) transformResults:nil];
+      [[FSTMutationResult alloc] initWithVersion:testutil::Version(4) transformResults:nil];
   FSTMaybeDocument *patchedDoc = [patch applyTo:baseDoc
                                    baseDocument:baseDoc
                                  localWriteTime:_timestamp
@@ -394,15 +394,15 @@ using firebase::firestore::model::TransformOperation;
   XCTAssertEqualObjects(patchedDoc, FSTTestDoc("collection/key", 0, expectedData, NO));
 }
 
-#define ASSERT_VERSION_TRANSITION(mutation, base, expected)                                 \
-  do {                                                                                      \
-    FSTMutationResult *mutationResult =                                                     \
-        [[FSTMutationResult alloc] initWithVersion:FSTTestVersion(0) transformResults:nil]; \
-    FSTMaybeDocument *actual = [mutation applyTo:base                                       \
-                                    baseDocument:base                                       \
-                                  localWriteTime:_timestamp                                 \
-                                  mutationResult:mutationResult];                           \
-    XCTAssertEqualObjects(actual, expected);                                                \
+#define ASSERT_VERSION_TRANSITION(mutation, base, expected)                                    \
+  do {                                                                                         \
+    FSTMutationResult *mutationResult =                                                        \
+        [[FSTMutationResult alloc] initWithVersion:testutil::Version(0) transformResults:nil]; \
+    FSTMaybeDocument *actual = [mutation applyTo:base                                          \
+                                    baseDocument:base                                          \
+                                  localWriteTime:_timestamp                                    \
+                                  mutationResult:mutationResult];                              \
+    XCTAssertEqualObjects(actual, expected);                                                   \
   } while (0);
 
 /**