From cbb1de07472b44aef09a8e6c5f97f35ee249f927 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 5 Dec 2021 11:21:04 +0100 Subject: [PATCH] Waiting for Trading Session to be ran --- Projects/Network/SA/Modules/HttpNetworkClient.js | 3 ++- Projects/Network/SA/Modules/P2PNetworkStart.js | 4 ++-- Projects/ProjectsSchema.json | 2 +- TaskServer/TaskServer.js | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Projects/Network/SA/Modules/HttpNetworkClient.js b/Projects/Network/SA/Modules/HttpNetworkClient.js index 71d3d0c41..e248ee916 100644 --- a/Projects/Network/SA/Modules/HttpNetworkClient.js +++ b/Projects/Network/SA/Modules/HttpNetworkClient.js @@ -1,6 +1,7 @@ exports.newNetworkModulesHttpNetworkClient = function newNetworkModulesHttpNetworkClient() { let thisObject = { + callerRole: undefined, host: undefined, port: undefined, p2pNetworkNode: undefined, @@ -25,7 +26,7 @@ exports.newNetworkModulesHttpNetworkClient = function newNetworkModulesHttpNetwo web3 = undefined } - async function initialize(p2pNetworkClientIdentity, p2pNetworkNode) { + async function initialize(callerRole, p2pNetworkClientIdentity, p2pNetworkNode) { thisObject.callerRole = callerRole thisObject.p2pNetworkClientIdentity = p2pNetworkClientIdentity thisObject.p2pNetworkClientCodeName = JSON.parse(thisObject.p2pNetworkClientIdentity.node.config).codeName diff --git a/Projects/Network/SA/Modules/P2PNetworkStart.js b/Projects/Network/SA/Modules/P2PNetworkStart.js index 7eab99c90..e4d469e08 100644 --- a/Projects/Network/SA/Modules/P2PNetworkStart.js +++ b/Projects/Network/SA/Modules/P2PNetworkStart.js @@ -73,11 +73,11 @@ exports.newNetworkModulesP2PNetworkStart = function newNetworkModulesP2PNetworkS Test if the peer is actually online. */ if (peer.httpClient === undefined) { - peer.httpClient = SA.projects.network.modules.webSocketsNetworkClient.newNetworkModulesHttpNetworkClient() + peer.httpClient = SA.projects.network.modules.webHttpNetworkClient.newNetworkModulesHttpNetworkClient() peer.httpClient.initialize(callerRole, p2pNetworkClientIdentity, peer.p2pNetworkNode) } - return await peer.httpClient.testConnection() + return true // TODO:: actually check if this node is online } } } diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json index fc7dd2269..449df9d03 100644 --- a/Projects/ProjectsSchema.json +++ b/Projects/ProjectsSchema.json @@ -1609,7 +1609,7 @@ }, { "name": "Http Network Client", - "propertyName": "webSocketsNetworkClient", + "propertyName": "webHttpNetworkClient", "functionName": "newNetworkModulesHttpNetworkClient", "fileName": "HttpNetworkClient.js" }, diff --git a/TaskServer/TaskServer.js b/TaskServer/TaskServer.js index 11af98815..0393e2d0e 100644 --- a/TaskServer/TaskServer.js +++ b/TaskServer/TaskServer.js @@ -158,7 +158,7 @@ exports.newTaskServer = function newTaskServer() { /* Set up the connections to network start nodes. These connections will be used to send signals. */ - TS.projects.foundations.globals.taskConstants.P2P_NETWORK.p2pNetworkStart = SA.projects.network.modules.p2pNetworkPeers.newNetworkModulesP2PNetworkStart() + TS.projects.foundations.globals.taskConstants.P2P_NETWORK.p2pNetworkStart = SA.projects.network.modules.p2pNetworkStart.newNetworkModulesP2PNetworkStart() await TS.projects.foundations.globals.taskConstants.P2P_NETWORK.p2pNetworkStart.initialize( 'Network Client', TS.projects.foundations.globals.taskConstants.P2P_NETWORK.p2pNetworkClientIdentity,