From 2347a8ebd76a83640ddedd69ca76c3b9fcec88c4 Mon Sep 17 00:00:00 2001
From: Christopher Maree <christopher.maree@gmail.com>
Date: Tue, 27 Oct 2020 11:44:41 +0200
Subject: [PATCH 1/4] Fixed hub return types

---
 .../scripts/serverless-orchestration/ServerlessHub.js     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/core/scripts/serverless-orchestration/ServerlessHub.js b/packages/core/scripts/serverless-orchestration/ServerlessHub.js
index 33ff24ff4c..68b0785b7c 100644
--- a/packages/core/scripts/serverless-orchestration/ServerlessHub.js
+++ b/packages/core/scripts/serverless-orchestration/ServerlessHub.js
@@ -60,7 +60,9 @@ hub.post("/", async (req, res) => {
     // Fetch the last block number this given config file queried the blockchain at if running in production. Else, pull from env.
     const lastQueriedBlockNumber = await _getLastQueriedBlockNumber(req.body.configFile);
     if (!configObject || !lastQueriedBlockNumber)
-      throw new Error("Serverless hub requires a config object and a last updated block number!");
+      throw new Error(
+        `Serverless hub requires a config object and a last updated block number! configObject:${configObject} lastQueriedBlockNumber: ${lastQueriedBlockNumber}`
+      );
 
     // Get the latest block number. The query will run from the last queried block number to the latest block number.
     const latestBlockNumber = await _getLatestBlockNumber();
@@ -261,7 +263,7 @@ async function _saveQueriedBlockNumber(configIdentifier, blockNumber) {
 // recorded by the bot to inform where searches should start from.
 async function _getLastQueriedBlockNumber(configIdentifier) {
   // sometimes the GCP datastore can be flaky and return errors when saving data. Use re-try logic to re-run on error.
-  await retry(
+  return await retry(
     async () => {
       if (hubConfig.saveQueriedBlock == "gcp") {
         const key = datastore.key(["BlockNumberLog", configIdentifier]);
@@ -360,4 +362,4 @@ if (require.main === module) {
 }
 
 hub.Poll = Poll;
-module.exports = hub;
+module.exports = { hub, _getLastQueriedBlockNumber };

From 3f73b805dab4bf33469e551d621adb6e98031cc1 Mon Sep 17 00:00:00 2001
From: Christopher Maree <christopher.maree@gmail.com>
Date: Tue, 27 Oct 2020 12:38:57 +0200
Subject: [PATCH 2/4] reverted export

---
 packages/core/scripts/serverless-orchestration/ServerlessHub.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/scripts/serverless-orchestration/ServerlessHub.js b/packages/core/scripts/serverless-orchestration/ServerlessHub.js
index 68b0785b7c..6714d48593 100644
--- a/packages/core/scripts/serverless-orchestration/ServerlessHub.js
+++ b/packages/core/scripts/serverless-orchestration/ServerlessHub.js
@@ -362,4 +362,4 @@ if (require.main === module) {
 }
 
 hub.Poll = Poll;
-module.exports = { hub, _getLastQueriedBlockNumber };
+module.exports = hub;

From 8f4af317c44079018e7f4adb907d1f6cac30fa47 Mon Sep 17 00:00:00 2001
From: Christopher Maree <christopher.maree@gmail.com>
Date: Tue, 27 Oct 2020 12:39:47 +0200
Subject: [PATCH 3/4] updated error log

---
 packages/core/scripts/serverless-orchestration/ServerlessHub.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/scripts/serverless-orchestration/ServerlessHub.js b/packages/core/scripts/serverless-orchestration/ServerlessHub.js
index 6714d48593..d2e4d08eb2 100644
--- a/packages/core/scripts/serverless-orchestration/ServerlessHub.js
+++ b/packages/core/scripts/serverless-orchestration/ServerlessHub.js
@@ -61,7 +61,7 @@ hub.post("/", async (req, res) => {
     const lastQueriedBlockNumber = await _getLastQueriedBlockNumber(req.body.configFile);
     if (!configObject || !lastQueriedBlockNumber)
       throw new Error(
-        `Serverless hub requires a config object and a last updated block number! configObject:${configObject} lastQueriedBlockNumber: ${lastQueriedBlockNumber}`
+        `Serverless hub requires a config object and a last updated block number! configObject:${configObject} lastQueriedBlockNumber:${lastQueriedBlockNumber}`
       );
 
     // Get the latest block number. The query will run from the last queried block number to the latest block number.

From 14865901829c028638d91da4e2b5fb883a0acd6c Mon Sep 17 00:00:00 2001
From: Christopher Maree <christopher.maree@gmail.com>
Date: Wed, 28 Oct 2020 08:57:01 +0200
Subject: [PATCH 4/4] nit

Signed-off-by: Christopher Maree <christopher.maree@gmail.com>
---
 .../core/scripts/serverless-orchestration/ServerlessHub.js    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/core/scripts/serverless-orchestration/ServerlessHub.js b/packages/core/scripts/serverless-orchestration/ServerlessHub.js
index d2e4d08eb2..31aec243f3 100644
--- a/packages/core/scripts/serverless-orchestration/ServerlessHub.js
+++ b/packages/core/scripts/serverless-orchestration/ServerlessHub.js
@@ -61,7 +61,9 @@ hub.post("/", async (req, res) => {
     const lastQueriedBlockNumber = await _getLastQueriedBlockNumber(req.body.configFile);
     if (!configObject || !lastQueriedBlockNumber)
       throw new Error(
-        `Serverless hub requires a config object and a last updated block number! configObject:${configObject} lastQueriedBlockNumber:${lastQueriedBlockNumber}`
+        `Serverless hub requires a config object and a last updated block number! configObject:${JSON.stringify(
+          configObject
+        )} lastQueriedBlockNumber:${lastQueriedBlockNumber}`
       );
 
     // Get the latest block number. The query will run from the last queried block number to the latest block number.