Rename FirestoreErrorCode to just Error (#3460)

Author: var-const

Firestore/Example/Tests/Core/FSTQueryListenerTests.mm

@@ -40,7 +40,7 @@
 #include "Firestore/core/src/firebase/firestore/util/statusor.h"
 #include "Firestore/core/test/firebase/firestore/testutil/xcgmock.h"
 
-using firebase::firestore::FirestoreErrorCode;
+using firebase::firestore::Error;
 using firebase::firestore::core::AsyncEventListener;
 using firebase::firestore::core::EventListener;
 using firebase::firestore::core::DocumentViewChange;
@@ -149,7 +149,7 @@ - (void)testRaisesErrorEvent {
     accum.push_back(maybe_snapshot.status());
   });
 
-  Status testError{FirestoreErrorCode::Unauthenticated, "Some info"};
+  Status testError{Error::Unauthenticated, "Some info"};
   listener->OnError(testError);
 
   XC_ASSERT_THAT(accum, ElementsAre(testError));

Firestore/Example/Tests/Local/FSTLRUGarbageCollectorTests.h

@@ -30,4 +30,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Firestore/Example/Tests/Local/FSTLevelDBMigrationsTests.mm

@@ -37,7 +37,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-using firebase::firestore::FirestoreErrorCode;
+using firebase::firestore::Error;
 using firebase::firestore::local::LevelDbCollectionParentKey;
 using firebase::firestore::local::LevelDbDocumentMutationKey;
 using firebase::firestore::local::LevelDbDocumentTargetKey;

Firestore/Example/Tests/Local/FSTMemoryLRUGarbageCollectorTests.mm

@@ -44,4 +44,4 @@ - (BOOL)sentinelExists:(const DocumentKey &)key {
 
 @end
 
-NS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Firestore/Example/Tests/Remote/FSTSerializerBetaTests.mm

@@ -63,7 +63,7 @@
 namespace testutil = firebase::firestore::testutil;
 namespace util = firebase::firestore::util;
 using firebase::Timestamp;
-using firebase::firestore::FirestoreErrorCode;
+using firebase::firestore::Error;
 using firebase::firestore::core::FieldFilter;
 using firebase::firestore::model::DatabaseId;
 using firebase::firestore::model::DocumentKey;
@@ -853,7 +853,7 @@ - (void)testConvertsTargetChangeWithRemoved {
   WatchTargetChange expected{WatchTargetChangeState::Removed,
                              {1, 4},
                              FSTTestData(0, 1, 2, -1),
-                             Status{FirestoreErrorCode::PermissionDenied, "Error message"}};
+                             Status{Error::PermissionDenied, "Error message"}};
 
   GCFSListenResponse *listenResponse = [GCFSListenResponse message];
   listenResponse.targetChange.targetChangeType = GCFSTargetChange_TargetChangeType_Remove;

Firestore/Example/Tests/SpecTests/FSTSpecTests.mm

@@ -58,7 +58,7 @@
 namespace objc = firebase::firestore::objc;
 namespace testutil = firebase::firestore::testutil;
 namespace util = firebase::firestore::util;
-using firebase::firestore::FirestoreErrorCode;
+using firebase::firestore::Error;
 using firebase::firestore::auth::User;
 using firebase::firestore::core::DocumentViewChange;
 using firebase::firestore::model::DocumentKey;
@@ -283,7 +283,7 @@ - (void)doWatchRemove:(NSDictionary *)watchRemoveSpec {
     NSDictionary *userInfo = @{
       NSLocalizedDescriptionKey : @"Error from watchRemove.",
     };
-    error = Status{static_cast<FirestoreErrorCode>(code), MakeString([userInfo description])};
+    error = Status{static_cast<Error>(code), MakeString([userInfo description])};
   }
   WatchTargetChange change{WatchTargetChangeState::Removed,
                            ConvertTargetsArray(watchRemoveSpec[@"targetIds"]), error};

Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.mm

@@ -55,7 +55,7 @@
 #include "absl/memory/memory.h"
 
 namespace objc = firebase::firestore::objc;
-using firebase::firestore::FirestoreErrorCode;
+using firebase::firestore::Error;
 using firebase::firestore::auth::EmptyCredentialsProvider;
 using firebase::firestore::auth::HashUser;
 using firebase::firestore::auth::User;
@@ -311,7 +311,7 @@ - (FSTOutstandingWrite *)receiveWriteAckWithVersion:(const SnapshotVersion &)com
 - (FSTOutstandingWrite *)receiveWriteError:(int)errorCode
                                   userInfo:(NSDictionary<NSString *, id> *)userInfo
                                keepInQueue:(BOOL)keepInQueue {
-  Status error{static_cast<FirestoreErrorCode>(errorCode), MakeString([userInfo description])};
+  Status error{static_cast<Error>(errorCode), MakeString([userInfo description])};
 
   FSTOutstandingWrite *write = [self currentOutstandingWrites].firstObject;
   [self validateNextWriteSent:write.write];
@@ -408,7 +408,7 @@ - (void)receiveWatchChange:(const WatchChange &)change
 }
 
 - (void)receiveWatchStreamError:(int)errorCode userInfo:(NSDictionary<NSString *, id> *)userInfo {
-  Status error{static_cast<FirestoreErrorCode>(errorCode), MakeString([userInfo description])};
+  Status error{static_cast<Error>(errorCode), MakeString([userInfo description])};
 
   _workerQueue->EnqueueBlocking([&] {
     _datastore->FailWatchStream(error);

Firestore/Source/Core/FSTFirestoreClient.mm

@@ -57,7 +57,7 @@
 #include "absl/memory/memory.h"
 
 namespace util = firebase::firestore::util;
-using firebase::firestore::FirestoreErrorCode;
+using firebase::firestore::Error;
 using firebase::firestore::api::DocumentReference;
 using firebase::firestore::api::DocumentSnapshot;
 using firebase::firestore::api::Settings;
@@ -369,10 +369,10 @@ - (void)getDocumentFromLocalCache:(const DocumentReference &)doc
                                         /*from_cache=*/true,
                                         /*has_pending_writes=*/false};
     } else {
-      maybe_snapshot = Status{FirestoreErrorCode::Unavailable,
-                              "Failed to get document from cache. (However, this document "
-                              "may exist on the server. Run again without setting source to "
-                              "FirestoreSourceCache to attempt to retrieve the document "};
+      maybe_snapshot =
+          Status{Error::Unavailable, "Failed to get document from cache. (However, this document "
+                                     "may exist on the server. Run again without setting source to "
+                                     "FirestoreSourceCache to attempt to retrieve the document "};
     }
 
     if (shared_callback) {

Firestore/Source/Core/FSTSyncEngine.mm

@@ -50,7 +50,7 @@
 #include "Firestore/core/src/firebase/firestore/util/status.h"
 #include "absl/types/optional.h"
 
-using firebase::firestore::FirestoreErrorCode;
+using firebase::firestore::Error;
 using firebase::firestore::auth::HashUser;
 using firebase::firestore::auth::User;
 using firebase::firestore::core::TargetIdGenerator;
@@ -648,8 +648,8 @@ - (BOOL)errorIsInteresting:(NSError *)error {
 - (BOOL)isRetryableTransactionError:(const Status &)error {
   // In transactions, the backend will fail outdated reads with FAILED_PRECONDITION and
   // non-matching document versions with ABORTED. These errors should be retried.
-  FirestoreErrorCode code = error.code();
-  return code == FirestoreErrorCode::Aborted || code == FirestoreErrorCode::FailedPrecondition ||
+  Error code = error.code();
+  return code == Error::Aborted || code == Error::FailedPrecondition ||
          !Datastore::IsPermanentError(error);
 }
 

Firestore/Source/Local/FSTLevelDB.mm

@@ -57,7 +57,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 namespace util = firebase::firestore::util;
-using firebase::firestore::FirestoreErrorCode;
+using firebase::firestore::Error;
 using firebase::firestore::auth::User;
 using firebase::firestore::core::DatabaseInfo;
 using firebase::firestore::local::ConvertStatus;
@@ -445,15 +445,13 @@ + (Path)storageDirectoryForDatabaseInfo:(const DatabaseInfo &)databaseInfo
 + (Status)ensureDirectory:(const Path &)directory {
   Status status = util::RecursivelyCreateDir(directory);
   if (!status.ok()) {
-    return Status{FirestoreErrorCode::Internal, "Failed to create persistence directory"}.CausedBy(
-        status);
+    return Status{Error::Internal, "Failed to create persistence directory"}.CausedBy(status);
   }
 
   NSURL *dirURL = [NSURL fileURLWithPath:directory.ToNSString()];
   NSError *localError = nil;
   if (![dirURL setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:&localError]) {
-    return Status{FirestoreErrorCode::Internal,
-                  "Failed to mark persistence directory as excluded from backups"}
+    return Status{Error::Internal, "Failed to mark persistence directory as excluded from backups"}
         .CausedBy(Status::FromNSError(localError));
   }
 
@@ -468,7 +466,7 @@ + (Status)ensureDirectory:(const Path &)directory {
   DB *database = nullptr;
   leveldb::Status status = DB::Open(options, directory.ToUtf8String(), &database);
   if (!status.ok()) {
-    return Status{FirestoreErrorCode::Internal,
+    return Status{Error::Internal,
                   StringFormat("Failed to open LevelDB database at %s", directory.ToUtf8String())}
         .CausedBy(ConvertStatus(status));
   }