From 6c890de4a86613d6be26c1849eb80f64e6bf5d04 Mon Sep 17 00:00:00 2001 From: Ivan FB <128452529+Ivansete-status@users.noreply.github.com> Date: Mon, 9 Sep 2024 10:45:14 +0200 Subject: [PATCH] chore: Bump dependencies for v0.33 (#3017) --- library/libwaku.nim | 4 ++-- vendor/nim-chronicles | 2 +- vendor/nim-chronos | 2 +- vendor/nim-http-utils | 2 +- vendor/nim-libbacktrace | 2 +- vendor/nim-metrics | 2 +- vendor/nim-nat-traversal | 2 +- vendor/nim-results | 2 +- vendor/nim-sqlite3-abi | 2 +- vendor/nim-stew | 2 +- waku/waku_api/rest/admin/handlers.nim | 7 ++++--- waku/waku_api/rest/legacy_store/handlers.nim | 5 +++-- waku/waku_api/rest/store/handlers.nim | 10 ++++++---- 13 files changed, 24 insertions(+), 20 deletions(-) diff --git a/library/libwaku.nim b/library/libwaku.nim index ce1d16abd7..1b305dbc45 100644 --- a/library/libwaku.nim +++ b/library/libwaku.nim @@ -265,7 +265,7 @@ proc waku_relay_publish( deallocShared(jwm) let wakuMessage = jsonMessage.toWakuMessage().valueOr: - let msg = fmt"Problem building the WakuMessage: {error}" + let msg = "Problem building the WakuMessage: " & $error callback(RET_ERR, unsafeAddr msg[0], cast[csize_t](len(msg)), userData) return RET_ERR @@ -464,7 +464,7 @@ proc waku_lightpush_publish( return RET_ERR let wakuMessage = jsonMessage.toWakuMessage().valueOr: - let msg = fmt"Problem building the WakuMessage: {error}" + let msg = "Problem building the WakuMessage: " & $error callback(RET_ERR, unsafeAddr msg[0], cast[csize_t](len(msg)), userData) return RET_ERR diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles index 33761a5f77..a28bb9781c 160000 --- a/vendor/nim-chronicles +++ b/vendor/nim-chronicles @@ -1 +1 @@ -Subproject commit 33761a5f77610d3f87f774244490eae43a9ac5a1 +Subproject commit a28bb9781ce74e725796c307ad05083e646872be diff --git a/vendor/nim-chronos b/vendor/nim-chronos index dc3847e4d6..c04576d829 160000 --- a/vendor/nim-chronos +++ b/vendor/nim-chronos @@ -1 +1 @@ -Subproject commit dc3847e4d6733dfc3811454c2a9c384b87343e26 +Subproject commit c04576d829b8a0a1b12baaa8bc92037501b3a4a0 diff --git a/vendor/nim-http-utils b/vendor/nim-http-utils index 98496aa24d..8b88ad6dd9 160000 --- a/vendor/nim-http-utils +++ b/vendor/nim-http-utils @@ -1 +1 @@ -Subproject commit 98496aa24d9364d1652e531f5f346de9b7cb3e15 +Subproject commit 8b88ad6dd9a6326c29f82067800c483d9410d873 diff --git a/vendor/nim-libbacktrace b/vendor/nim-libbacktrace index 6a5a44b16f..b6e26f03c0 160000 --- a/vendor/nim-libbacktrace +++ b/vendor/nim-libbacktrace @@ -1 +1 @@ -Subproject commit 6a5a44b16f22b63028e919f64391561c2d75805b +Subproject commit b6e26f03c091a8e3bba6adc06198fc3055bacc66 diff --git a/vendor/nim-metrics b/vendor/nim-metrics index 4337ccd62c..29bb7ba63c 160000 --- a/vendor/nim-metrics +++ b/vendor/nim-metrics @@ -1 +1 @@ -Subproject commit 4337ccd62c0b7d57492402dd4cb838ddc0c78a84 +Subproject commit 29bb7ba63cd884770169891687595348a70cf166 diff --git a/vendor/nim-nat-traversal b/vendor/nim-nat-traversal index 717639bf72..a3aa0c5f9d 160000 --- a/vendor/nim-nat-traversal +++ b/vendor/nim-nat-traversal @@ -1 +1 @@ -Subproject commit 717639bf72c7e59548e666cf4801097c98be4f9e +Subproject commit a3aa0c5f9d2a2870f1fd0f7a613d4fe025c84ab7 diff --git a/vendor/nim-results b/vendor/nim-results index 8a03fb2e00..71d404b314 160000 --- a/vendor/nim-results +++ b/vendor/nim-results @@ -1 +1 @@ -Subproject commit 8a03fb2e00dccbf35807c869e0184933b0cffa37 +Subproject commit 71d404b314479a6205bfd050f4fe5fe49cdafc69 diff --git a/vendor/nim-sqlite3-abi b/vendor/nim-sqlite3-abi index 362e1bd9f6..acd3c32743 160000 --- a/vendor/nim-sqlite3-abi +++ b/vendor/nim-sqlite3-abi @@ -1 +1 @@ -Subproject commit 362e1bd9f689ad9f5380d9d27f0705b3d4dfc7d3 +Subproject commit acd3c327433784226b412757bdb5455b5be04c55 diff --git a/vendor/nim-stew b/vendor/nim-stew index af07b0a70d..d4634c5405 160000 --- a/vendor/nim-stew +++ b/vendor/nim-stew @@ -1 +1 @@ -Subproject commit af07b0a70dbd5528cbca9d944b0aa8b7bea92963 +Subproject commit d4634c5405ac188e7050d348332edb6c3b09a527 diff --git a/waku/waku_api/rest/admin/handlers.nim b/waku/waku_api/rest/admin/handlers.nim index bf73bf0168..9570e413a4 100644 --- a/waku/waku_api/rest/admin/handlers.nim +++ b/waku/waku_api/rest/admin/handlers.nim @@ -128,12 +128,13 @@ proc installAdminV1PostPeersHandler(router: var RestRouter, node: WakuNode) = contentBody: Option[ContentBody] ) -> RestApiResponse: let peers: seq[string] = decodeRequestBody[seq[string]](contentBody).valueOr: - return RestApiResponse.badRequest(fmt("Failed to decode request: {error}")) + let e = $error + return RestApiResponse.badRequest(fmt("Failed to decode request: {e}")) for i, peer in peers: let peerInfo = parsePeerInfo(peer).valueOr: - return - RestApiResponse.badRequest(fmt("Couldn't parse remote peer info: {error}")) + let e = $error + return RestApiResponse.badRequest(fmt("Couldn't parse remote peer info: {e}")) if not (await node.peerManager.connectRelay(peerInfo, source = "rest")): return RestApiResponse.badRequest( diff --git a/waku/waku_api/rest/legacy_store/handlers.nim b/waku/waku_api/rest/legacy_store/handlers.nim index f0747a8de6..d960f24eac 100644 --- a/waku/waku_api/rest/legacy_store/handlers.nim +++ b/waku/waku_api/rest/legacy_store/handlers.nim @@ -183,8 +183,9 @@ proc retrieveMsgsFromSelfNode( let storeResp = selfResp.toStoreResponseRest() let resp = RestApiResponse.jsonResponse(storeResp, status = Http200).valueOr: const msg = "Error building the json respose" - error msg, error = error - return RestApiResponse.internalServerError(fmt("{msg} [{error}]")) + let e = $error + error msg, error = e + return RestApiResponse.internalServerError(fmt("{msg} [{e}]")) return resp diff --git a/waku/waku_api/rest/store/handlers.nim b/waku/waku_api/rest/store/handlers.nim index b835645b0d..663d796eab 100644 --- a/waku/waku_api/rest/store/handlers.nim +++ b/waku/waku_api/rest/store/handlers.nim @@ -50,8 +50,9 @@ proc performStoreQuery( let resp = RestApiResponse.jsonResponse(res, status = Http200).valueOr: const msg = "Error building the json respose" - error msg, error = error - return RestApiResponse.internalServerError(fmt("{msg} [{error}]")) + let e = $error + error msg, error = e + return RestApiResponse.internalServerError(fmt("{msg} [{e}]")) return resp @@ -166,8 +167,9 @@ proc retrieveMsgsFromSelfNode( let resp = RestApiResponse.jsonResponse(storeResp, status = Http200).valueOr: const msg = "Error building the json respose" - error msg, error = error - return RestApiResponse.internalServerError(fmt("{msg} [{error}]")) + let e = $error + error msg, error = e + return RestApiResponse.internalServerError(fmt("{msg} [{e}]")) return resp