merge conflict resolved

multiparty · Jun 6, 2024 · 7d81aad · 7d81aad
1 parent d675d1a
commit 7d81aad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/client/preprocessing/api.js b/lib/client/preprocessing/api.js
@@ -142,7 +142,7 @@ class PreprocessingAPI {
       id: null,
       params: params,
       protocols: protocols,
-      deferred: new this.jiffClient.helpers.Deferred()
+      deferred: this.jiffClient.helpers.createDeferred()
     };
 
     this.preprocessingTasks[this.preprocessingTasks.length - 1].add(task);

diff --git a/lib/client/preprocessing/daemon.js b/lib/client/preprocessing/daemon.js
@@ -11,8 +11,8 @@ class PreprocessDaemon {
     if (task.count > 1) {
       const remainingTasks = Object.assign({}, task);
 
-      const deferred1 = new this.jiffClient.helpers.Deferred();
-      const deferred2 = new this.jiffClient.helpers.Deferred();
+      const deferred1 = this.jiffClient.helpers.createDeferred();
+      const deferred2 = this.jiffClient.helpers.createDeferred();
       Promise.all([deferred1.promise, deferred2.promise]).then(task.deferred.resolve);
       task.deferred = deferred1;
       remainingTasks.deferred = deferred2;
@@ -169,7 +169,7 @@ class PreprocessDaemon {
         id: null,
         params: extra_params,
         protocols: task.protocols,
-        deferred: new this.jiffClient.helpers.Deferred()
+        deferred: this.jiffClient.helpers.createDeferred()
       };
 
       deferredChain.push(nextTask.deferred.promise);