Address PR comments

.swiftlint.yml

@@ -70,3 +70,4 @@ disabled_rules:
  # #unavailable was implemented in Swift 5.6 so we can't use it until that's
  # the minimum version we support
  - unavailable_condition
+ - large_tuple

Realm/ObjectServerTests/RLMUser+ObjectServerTests.h

@@ -25,9 +25,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)waitForUploadToFinish:(NSString *)partitionValue;
 - (BOOL)waitForDownloadToFinish:(NSString *)partitionValue;
 
-- (BOOL)waitForUploadsForRealm:(RLMRealm *)realm error:(NSError **)error;
-- (BOOL)waitForDownloadsForRealm:(RLMRealm *)realm error:(NSError **)error;
-
 - (void)simulateClientResetErrorForSession:(NSString *)partitionValue;
 
 @end

Realm/ObjectServerTests/RLMUser+ObjectServerTests.mm

@@ -58,45 +58,6 @@ - (BOOL)waitForDownloadToFinish:(NSString *)partitionValue {
  return dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeout * NSEC_PER_SEC))) == 0;
 }
 
-- (BOOL)waitForUploadsForRealm:(RLMRealm *)realm error:(NSError **)error {
- const NSTimeInterval timeout = 20;
- dispatch_semaphore_t sema = dispatch_semaphore_create(0);
- RLMSyncSession *session = realm.syncSession;
- NSAssert(session, @"Cannot call with invalid Realm");
- __block NSError *completionError;
- BOOL couldWait = [session waitForUploadCompletionOnQueue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0) callback:^(NSError *error) {
- completionError = error;
- dispatch_semaphore_signal(sema);
- }];
- if (!couldWait) {
- return NO;
- }
-
- if (error)
- *error = completionError;
-
- return dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeout * NSEC_PER_SEC))) == 0;
-}
-
-- (BOOL)waitForDownloadsForRealm:(RLMRealm *)realm error:(NSError **)error {
- const NSTimeInterval timeout = 20;
- dispatch_semaphore_t sema = dispatch_semaphore_create(0);
- RLMSyncSession *session = realm.syncSession;
- NSAssert(session, @"Cannot call with invalid Realm");
- __block NSError *completionError;
- BOOL couldWait = [session waitForDownloadCompletionOnQueue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0) callback:^(NSError *error) {
- completionError = error;
- }];
- if (!couldWait) {
- return NO;
- }
-
- if (error)
- *error = completionError;
-
- return dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeout * NSEC_PER_SEC))) == 0;
-}
-
 - (void)simulateClientResetErrorForSession:(NSString *)partitionValue {
  RLMSyncSession *session = [self sessionForPartitionValue:partitionValue];
  NSAssert(session, @"Cannot call with invalid URL");

Realm/ObjectServerTests/SwiftFlexibleSyncServerTests.swift

@@ -413,8 +413,10 @@ extension SwiftFlexibleSyncTests {
  XCTAssertEqual(realm.subscriptions.count, numberOfSubs)
 
  var count = 0
- for subscription in realm.subscriptions {
+ for (index, subscription) in realm.subscriptions.enumerated() {
  XCTAssertNotNil(subscription)
+ XCTAssertEqual(subscription.query, "age > \(index + 1)")
+ XCTAssertTrue((Calendar.current.date(byAdding: DateComponents(hour: -1), to: Date())!...Date()).contains(subscription.createdAt))
  count += 1
  }
 

Realm/ObjectServerTests/SwiftObjectServerTests.swift

@@ -2786,6 +2786,7 @@ class CombineObjectServerTests: SwiftSyncTestCase {
 }
 
 #if swift(>=5.6) && canImport(_Concurrency)
+
 @available(macOS 12.0, *)
 class AsyncAwaitObjectServerTests: SwiftSyncTestCase {
  override class var defaultTestSuite: XCTestSuite {

Realm/RLMSyncSubscription.mm

@@ -192,7 +192,6 @@ NSUInteger RLMFastEnumerate(NSFastEnumerationState *state,
 
 @implementation RLMSyncSubscriptionSet {
  std::mutex _collectionEnumeratorMutex;
- RLMRealm *_realm;
 }
 
 - (instancetype)initWithSubscriptionSet:(realm::sync::SubscriptionSet)subscriptionSet
@@ -245,6 +244,12 @@ - (void)update:(__attribute__((noescape)) void(^)(void))block {
 }
 
 - (void)update:(__attribute__((noescape)) void(^)(void))block onComplete:(void(^)(NSError *))completionBlock {
+ return [self update:block queue:nil onComplete:completionBlock];
+}
+
+- (void)update:(__attribute__((noescape)) void(^)(void))block
+ queue:(nullable dispatch_queue_t)queue
+ onComplete:(void(^)(NSError *))completionBlock {
  if (_mutableSubscriptionSet != nil) {
  @throw RLMException(@"Cannot initiate a write transaction on subscription set that is already been updated.");
  }
@@ -285,6 +290,11 @@ - (void)waitForSynchronizationOnQueue:(nullable dispatch_queue_t)queue
  });
 }
 
+- (void)write:(__attribute__((noescape)) void(^)(void))block onComplete:(void(^)(NSError *))completionBlock {
+ [self update:block queue:nil onComplete:completionBlock];
+}
+
+
 #pragma mark - Find subscription
 
 - (nullable RLMSyncSubscription *)subscriptionWithName:(NSString *)name {

Realm/RLMSyncSubscription_Private.h

@@ -51,8 +51,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface RLMSyncSubscriptionSet ()
 
+@property (nonatomic, readonly) RLMRealm *realm;
 @property (readonly) uint64_t version;
 
+- (void)update:(__attribute__((noescape)) void(^)(void))block queue:(nullable dispatch_queue_t)queue onComplete:(void(^)(NSError *))completionBlock;
+
 - (void)addSubscriptionWithClassName:(NSString *)objectClassName
  subscriptionName:(nullable NSString *)name
  predicate:(NSPredicate *)predicate