refactor(daemon): Simplify incarnateGuest parallelism

endojs · Mar 8, 2024 · f546680 · f546680
1 parent 8f44e6e
commit f546680
Showing 1 changed file with 12 additions and 19 deletions.
diff --git a/packages/daemon/src/daemon.js b/packages/daemon/src/daemon.js
@@ -1015,35 +1015,28 @@ const makeDaemonCore = async (
       storeFormulaIdentifier,
       workerFormulaIdentifier,
     } = await formulaGraphMutex.enqueue(async () => {
-      const [
-        ownFormulaNumber,
-        hostHandle,
-        storeIncarnation,
-        workerIncarnation,
-      ] = await Promise.all([
-        randomHex512(),
-        randomHex512(),
-        randomHex512(),
-        randomHex512(),
-      ]).then(([own, handle, store, worker]) =>
-        Promise.all([
-          own,
-          incarnateNumberedHandle(handle, hostFormulaIdentifier),
-          incarnateNumberedPetStore(store),
-          incarnateNumberedWorker(worker),
-        ]),
+      const formulaNumber = await randomHex512();
+      const hostHandle = await incarnateNumberedHandle(
+        await randomHex512(),
+        hostFormulaIdentifier,
+      );
+      const storeIncarnation = await incarnateNumberedPetStore(
+        await randomHex512(),
+      );
+      const workerIncarnation = await incarnateNumberedWorker(
+        await randomHex512(),
       );
 
       await deferredTasks.execute({
         guestFormulaIdentifier: serializeFormulaIdentifier({
           type: 'guest',
-          number: ownFormulaNumber,
+          number: formulaNumber,
           node: ownNodeIdentifier,
         }),
       });
 
       return harden({
-        guestFormulaNumber: ownFormulaNumber,
+        guestFormulaNumber: formulaNumber,
         hostHandleFormulaIdentifier: hostHandle.formulaIdentifier,
         storeFormulaIdentifier: storeIncarnation.formulaIdentifier,
         workerFormulaIdentifier: workerIncarnation.formulaIdentifier,