Reduce diff

Author: schmidt-sebastian

packages/firestore/src/core/sync_engine.ts

@@ -279,16 +279,17 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
    */
   // PORTING NOTE: Multi-tab only.
   private async synchronizeViewAndComputeSnapshot(
-    queryData: QueryData,
-    view: View
+    queryView: QueryView
   ): Promise<ViewChange> {
     const queryResult = await this.localStore.executeQuery(
-      queryData.query,
+      queryView.query,
       /* usePreviousResults= */ true
     );
-    const viewSnapshot = view.synchronizeWithPersistedState(queryResult);
+    const viewSnapshot = queryView.view.synchronizeWithPersistedState(
+      queryResult
+    );
     if (this.isPrimary) {
-      this.updateTrackedLimbos(queryData.targetId, viewSnapshot.limboChanges);
+      this.updateTrackedLimbos(queryView.targetId, viewSnapshot.limboChanges);
     }
     return viewSnapshot;
   }
@@ -936,8 +937,7 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
         );
         queryData = await this.localStore.allocateQuery(queryView.query);
         const viewChange = await this.synchronizeViewAndComputeSnapshot(
-          queryData,
-          queryView.view
+          queryView
         );
         if (viewChange.snapshot) {
           newViewSnapshots.push(viewChange.snapshot);

packages/firestore/src/local/local_store.ts

@@ -872,16 +872,16 @@ export class LocalStore {
               });
           }
         })
-        .next(() => {
-          return this.queryEngine.getDocumentsMatchingQuery(
+        .next(() =>
+          this.queryEngine.getDocumentsMatchingQuery(
             txn,
             query,
             usePreviousResults
               ? lastLimboFreeSnapshotVersion
               : SnapshotVersion.MIN,
             usePreviousResults ? remoteKeys : documentKeySet()
-          );
-        })
+          )
+        )
         .next(documents => {
           return { documents, remoteKeys };
         });

packages/firestore/test/util/helpers.ts

@@ -271,19 +271,15 @@ export function bound(
 export function queryData(
   targetId: TargetId,
   queryPurpose: QueryPurpose,
-  path: string,
-  snapshotVersion: number = 0,
-  hasLimboFreeSnapshot: boolean = false
+  path: string
 ): QueryData {
   // Arbitrary value.
   const sequenceNumber = 0;
   return new QueryData(
     query(path)._query,
     targetId,
     queryPurpose,
-    sequenceNumber,
-    version(snapshotVersion),
-    hasLimboFreeSnapshot ? version(snapshotVersion) : SnapshotVersion.MIN
+    sequenceNumber
   );
 }