From 892a6105f98f6aa4a5dcaa702fcb3a11beb6e3af Mon Sep 17 00:00:00 2001
From: alessiodf <35549818+alessiodf@users.noreply.github.com>
Date: Thu, 10 Oct 2019 07:58:23 +0100
Subject: [PATCH] fix(core-p2p): convert isAppReady response to object (#3050)

---
 packages/core-p2p/src/socket-server/versions/utils.ts | 7 +++++--
 packages/core-p2p/src/socket-server/worker.ts         | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/core-p2p/src/socket-server/versions/utils.ts b/packages/core-p2p/src/socket-server/versions/utils.ts
index 425a00cc12..4188220169 100644
--- a/packages/core-p2p/src/socket-server/versions/utils.ts
+++ b/packages/core-p2p/src/socket-server/versions/utils.ts
@@ -3,8 +3,11 @@ import { isWhitelisted } from "../../utils/is-whitelisted";
 import * as internalHandlers from "./internal";
 import * as peerHandlers from "./peer";
 
-export const isAppReady = (): boolean => {
-    return !!app.resolvePlugin("transaction-pool") && !!app.resolvePlugin("blockchain") && !!app.resolvePlugin("p2p");
+export const isAppReady = (): { ready: boolean } => {
+    return {
+        ready:
+            !!app.resolvePlugin("transaction-pool") && !!app.resolvePlugin("blockchain") && !!app.resolvePlugin("p2p"),
+    };
 };
 
 export const getHandlers = (): { [key: string]: string[] } => {
diff --git a/packages/core-p2p/src/socket-server/worker.ts b/packages/core-p2p/src/socket-server/worker.ts
index 228c70d9c3..171b092365 100644
--- a/packages/core-p2p/src/socket-server/worker.ts
+++ b/packages/core-p2p/src/socket-server/worker.ts
@@ -130,7 +130,7 @@ export class Worker extends SCWorker {
             }
 
             // Check that blockchain, tx-pool and p2p are ready
-            const isAppReady: boolean = await this.sendToMasterAsync("p2p.utils.isAppReady");
+            const isAppReady: boolean = (await this.sendToMasterAsync("p2p.utils.isAppReady")).data.ready;
             if (!isAppReady) {
                 req.socket.terminate();
                 return;