Fix incorrectly implemented queuing logic (#2336)

Author: snario

packages/node/src/methods/queued-execution.ts

@@ -12,17 +12,18 @@ export async function executeFunctionWithinQueues(
   queueList: Queue[],
   f: () => Promise<any>
 ) {
-  let promise;
+  let executionPromise;
 
   function executeCached() {
-    if (!promise) promise = f();
-    return promise;
+    if (!executionPromise) executionPromise = f();
+    return executionPromise;
   }
 
   if (queueList.length > 0) {
-    for (const queue of queueList) queue.add(executeCached);
-    for (const queue of queueList) await queue;
-    return promise;
+    const promiseList: Promise<any>[] = [];
+    for (const queue of queueList) promiseList.push(queue.add(executeCached));
+    for (const promise of promiseList) await promise;
+    return executionPromise;
   }
 
   return executeCached();

packages/node/test/integration/install-concurrent-virtual.spec.ts

@@ -47,7 +47,25 @@ describe("Concurrently installing virtual applications with same intermediary",
     );
   });
 
-  it("can handle two TicTacToeApp proposals", async done => {
+  it("can handle two TicTacToeApp proposals syncronously made", done => {
+    let i = 0;
+
+    nodeA.on(NODE_EVENTS.INSTALL_VIRTUAL, () => {
+      i += 1;
+      if (i === 2) done();
+    });
+
+    for (const i of Array(2)) {
+      installVirtualApp(
+        nodeA,
+        nodeB,
+        nodeC,
+        (global["networkContext"] as NetworkContextForTestSuite).TicTacToeApp
+      );
+    }
+  });
+
+  it("can handle two TicTacToeApp proposals asyncronously made", async done => {
     let i = 0;
 
     nodeA.on(NODE_EVENTS.INSTALL_VIRTUAL, () => {

packages/node/test/integration/utils.ts

@@ -614,38 +614,34 @@ export async function makeVirtualProposal(
     Zero,
     CONVENTION_FOR_ETH_TOKEN_ADDRESS
   );
+
   const params = virtualProposalRpc.parameters as NodeTypes.ProposeInstallVirtualParams;
+
   const {
     result: {
       result: { appInstanceId }
     }
-  } = await nodeA.rpcRouter.dispatch(
-    jsonRpcDeserialize({
-      params,
-      jsonrpc: "2.0",
-      method: NodeTypes.RpcMethodName.PROPOSE_INSTALL_VIRTUAL,
-      id: Date.now()
-    })
-  );
-  // expect(appInstanceId).toBeDefined();
+  } = await nodeA.rpcRouter.dispatch({
+    parameters: params,
+    methodName: NodeTypes.RpcMethodName.PROPOSE_INSTALL_VIRTUAL,
+    id: Date.now()
+  });
+
   return { appInstanceId, params };
 }
 
-export function installTTTVirtual(
+export async function installTTTVirtual(
   node: Node,
   appInstanceId: string,
   intermediaryIdentifier: string
 ) {
-  const installVirtualReq = constructInstallVirtualRpc(
-    appInstanceId,
-    intermediaryIdentifier
+  return await node.rpcRouter.dispatch(
+    constructInstallVirtualRpc(appInstanceId, intermediaryIdentifier)
   );
-  node.rpcRouter.dispatch(installVirtualReq);
 }
 
-export function makeInstallCall(node: Node, appInstanceId: string) {
-  const installRpc = constructInstallRpc(appInstanceId);
-  return node.rpcRouter.dispatch(installRpc);
+export async function makeInstallCall(node: Node, appInstanceId: string) {
+  return await node.rpcRouter.dispatch(constructInstallRpc(appInstanceId));
 }
 
 export async function makeVirtualProposeCall(
@@ -766,24 +762,17 @@ export function getAppContext(
   appDefinition: string,
   initialState?: SolidityValueType
 ): AppContext {
-  let abiEncodings: AppABIEncodings;
-  let initialAppState: SolidityValueType;
-
   switch (appDefinition) {
     case (global["networkContext"] as NetworkContextForTestSuite).TicTacToeApp:
-      initialAppState = initialState ? initialState : initialEmptyTTTState();
-      abiEncodings = tttAbiEncodings;
-      break;
+      return {
+        appDefinition,
+        abiEncodings: tttAbiEncodings,
+        initialState: initialState ? initialState : initialEmptyTTTState()
+      };
 
     default:
-      throw Error(
+      throw new Error(
         `Proposing the specified app is not supported: ${appDefinition}`
       );
   }
-
-  return {
-    appDefinition,
-    abiEncodings,
-    initialState: initialAppState
-  };
 }