From 70aaeee7040edd3298e32f4528d4c392ebbfdc77 Mon Sep 17 00:00:00 2001
From: Eugene Kabanov <eugene.kabanov@status.im>
Date: Wed, 1 Nov 2023 09:27:43 +0200
Subject: [PATCH] Enable comprehensive reasons when REST server faults to
 create server. (#5546)

Bump chronos & presto.
---
 beacon_chain/nimbus_binary_common.nim | 33 ++++++++++++---------------
 vendor/nim-chronos                    |  2 +-
 vendor/nim-presto                     |  2 +-
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/beacon_chain/nimbus_binary_common.nim b/beacon_chain/nimbus_binary_common.nim
index 73ada81de..7defa0d5b 100644
--- a/beacon_chain/nimbus_binary_common.nim
+++ b/beacon_chain/nimbus_binary_common.nim
@@ -356,9 +356,10 @@ proc init*(T: type RestServerRef,
            allowedOrigin: Option[string],
            validateFn: PatternCallback,
            config: AnyConf): T =
-  let address = initTAddress(ip, port)
-  let serverFlags = {HttpServerFlags.QueryCommaSeparatedArray,
-                     HttpServerFlags.NotifyDisconnect}
+  let
+    address = initTAddress(ip, port)
+    serverFlags = {HttpServerFlags.QueryCommaSeparatedArray,
+                   HttpServerFlags.NotifyDisconnect}
   # We increase default timeout to help validator clients who poll our server
   # at least once per slot (12.seconds).
   let
@@ -370,26 +371,20 @@ proc init*(T: type RestServerRef,
     maxHeadersSize = config.restMaxRequestHeadersSize * 1024
     maxRequestBodySize = config.restMaxRequestBodySize * 1024
 
-  let res = try:
-    RestServerRef.new(RestRouter.init(validateFn, allowedOrigin),
-                      address, serverFlags = serverFlags,
-                      httpHeadersTimeout = headersTimeout,
-                      maxHeadersSize = maxHeadersSize,
-                      maxRequestBodySize = maxRequestBodySize)
-  except CatchableError as err:
-    notice "Rest server could not be started", address = $address,
-           reason = err.msg
-    return nil
-
+  let res = RestServerRef.new(RestRouter.init(validateFn, allowedOrigin),
+                              address, serverFlags = serverFlags,
+                              httpHeadersTimeout = headersTimeout,
+                              maxHeadersSize = maxHeadersSize,
+                              maxRequestBodySize = maxRequestBodySize,
+                              errorType = string)
   if res.isErr():
-    notice "Rest server could not be started", address = $address,
+    notice "REST HTTP server could not be started", address = $address,
            reason = res.error()
     nil
   else:
-    notice "Starting REST HTTP server",
-      url = "http://" & $ip & ":" & $port & "/"
-
-    res.get()
+    let server = res.get()
+    notice "Starting REST HTTP server", url = "http://" & $server.localAddress()
+    server
 
 type
   KeymanagerInitResult* = object
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
index 253bc3cfc..be2edab3a 160000
--- a/vendor/nim-chronos
+++ b/vendor/nim-chronos
@@ -1 +1 @@
-Subproject commit 253bc3cfc079de35f9b96b9934ce702605400a51
+Subproject commit be2edab3ac101da03a70cbf52bc3f3d972b35d91
diff --git a/vendor/nim-presto b/vendor/nim-presto
index 2ae448ff5..5ca16485e 160000
--- a/vendor/nim-presto
+++ b/vendor/nim-presto
@@ -1 +1 @@
-Subproject commit 2ae448ff5b0808c8f562c6f0a70bbd7a05407a37
+Subproject commit 5ca16485e4d74e531d50d289ebc0f869d9e6352b