2 files changed, 9 insertions, 75 deletions

diff --git a/subprojects/frontend/src/utils/ConditionVariable.ts b/subprojects/frontend/src/utils/ConditionVariable.ts
deleted file mode 100644
index 1d3431f7..00000000
--- a/subprojects/frontend/src/utils/ConditionVariable.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import PendingTask from './PendingTask';
-import getLogger from './getLogger';
-
-const log = getLogger('utils.ConditionVariable');
-
-export type Condition = () => boolean;
-
-export default class ConditionVariable {
-  private readonly condition: Condition;
-
-  private readonly defaultTimeout: number;
-
-  private listeners: PendingTask<void>[] = [];
-
-  constructor(condition: Condition, defaultTimeout = 0) {
-    this.condition = condition;
-    this.defaultTimeout = defaultTimeout;
-  }
-
-  async waitFor(timeoutMs?: number | undefined): Promise<void> {
-    if (this.condition()) {
-      return;
-    }
-    const timeoutOrDefault = timeoutMs ?? this.defaultTimeout;
-    let nowMs = Date.now();
-    const endMs = nowMs + timeoutOrDefault;
-    while (!this.condition() && nowMs < endMs) {
-      const remainingMs = endMs - nowMs;
-      const promise = new Promise<void>((resolve, reject) => {
-        if (this.condition()) {
-          resolve();
-          return;
-        }
-        const task = new PendingTask(resolve, reject, remainingMs);
-        this.listeners.push(task);
-      });
-      // We must keep waiting until the update has completed,
-      // so the tasks can't be started in parallel.
-      // eslint-disable-next-line no-await-in-loop
-      await promise;
-      nowMs = Date.now();
-    }
-    if (!this.condition()) {
-      log.error('Condition still does not hold after', timeoutOrDefault, 'ms');
-      throw new Error('Failed to wait for condition');
-    }
-  }
-
-  notifyAll(): void {
-    this.clearListenersWith((listener) => listener.resolve());
-  }
-
-  rejectAll(error: unknown): void {
-    this.clearListenersWith((listener) => listener.reject(error));
-  }
-
-  private clearListenersWith(callback: (listener: PendingTask<void>) => void) {
-    // Copy `listeners` so that we don't get into a race condition
-    // if one of the listeners adds another listener.
-    const { listeners } = this;
-    this.listeners = [];
-    listeners.forEach(callback);
-  }
-}
diff --git a/subprojects/frontend/src/utils/PendingTask.ts b/subprojects/frontend/src/utils/PendingTask.ts
index 3976bdf9..205c8452 100644
--- a/subprojects/frontend/src/utils/PendingTask.ts
+++ b/subprojects/frontend/src/utils/PendingTask.ts
@@ -14,21 +14,19 @@ export default class PendingTask<T> {
   constructor(
     resolveCallback: (value: T) => void,
     rejectCallback: (reason?: unknown) => void,
-    timeoutMs?: number | undefined,
-    timeoutCallback?: () => void | undefined,
+    timeoutMs: number | undefined,
+    timeoutCallback: () => void | undefined,
   ) {
     this.resolveCallback = resolveCallback;
     this.rejectCallback = rejectCallback;
-    if (timeoutMs) {
-      this.timeout = setTimeout(() => {
-        if (!this.resolved) {
-          this.reject(new Error('Request timed out'));
-          if (timeoutCallback) {
-            timeoutCallback();
-          }
+    this.timeout = setTimeout(() => {
+      if (!this.resolved) {
+        this.reject(new Error('Request timed out'));
+        if (timeoutCallback) {
+          timeoutCallback();
         }
-      }, timeoutMs);
-    }
+      }
+    }, timeoutMs);
   }
 
   resolve(value: T): void {