chore: v0.25 vendor bump and associated fixes (#2352)

waku-org · Jan 30, 2024 · 761ce7b · 761ce7b
1 parent edca1df
commit 761ce7b
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
diff --git a/vendor/nim-eth b/vendor/nim-eth
diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization
diff --git a/vendor/nim-metrics b/vendor/nim-metrics
diff --git a/vendor/nim-regex b/vendor/nim-regex
diff --git a/vendor/nim-toml-serialization b/vendor/nim-toml-serialization
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
diff --git a/waku/utils/collector.nim b/waku/utils/collector.nim
@@ -6,14 +6,15 @@ else:
 import
   metrics
 
-proc parseCollectorIntoF64(collector: Collector): float64 {.gcsafe, raises: [Defect] } = 
+proc parseCollectorIntoF64(collector: SimpleCollector): float64 {.gcsafe, raises: [Defect] } = 
   {.gcsafe.}:
     var total = 0.float64
-    for key in collector.metrics.keys():
-      try:
-        total = total + collector.value(key)
-      except KeyError:
-        discard
+    for metrics in collector.metrics:
+      for metric in metrics:
+        try:
+          total = total + metric.value
+        except KeyError:
+          discard
     return total
 
 template parseAndAccumulate*(collector: Collector, cumulativeValue: float64): float64 =

diff --git a/waku/waku_dnsdisc.nim b/waku/waku_dnsdisc.nim
@@ -21,7 +21,6 @@ import
   libp2p/multiaddress,
   libp2p/peerid,
   dnsdisc/client
-
 import
   ./waku_core
+2 −2		chronos/apps/http/httpbodyrw.nim
+8 −8		chronos/apps/http/httpclient.nim
+235 −94		chronos/apps/http/httpserver.nim
+3 −5		chronos/asyncsync.nim
+12 −0		chronos/config.nim
+19 −0		chronos/futures.nim
+2 −0		chronos/internal/asyncfutures.nim
+43 −30		chronos/internal/raisesfutures.nim
+10 −27		chronos/streams/asyncstream.nim
+2 −2		chronos/transports/common.nim
+13 −30		chronos/transports/datagram.nim
+41 −63		chronos/transports/stream.nim
+130 −0		docs/examples/middleware.nim
+1 −0		docs/src/SUMMARY.md
+1 −0		docs/src/examples.md
+102 −0		docs/src/http_server_middleware.md
+296 −3		tests/testhttpserver.nim
+40 −32		eth/db/kvstore_sqlite3.nim
+1 −1		eth/p2p/discoveryv5/protocol.nim
+1 −1		eth/utp/utp_discv5_protocol.nim
+2 −1		eth/utp/utp_protocol.nim
+1 −1		eth/utp/utp_router.nim
+2 −4		eth/utp/utp_socket.nim
+5 −5		tests/utp/test_discv5_protocol.nim
+1 −1		tests/utp/test_protocol.nim
+2 −2		tests/utp/test_utp_router.nim
+6 −7		tests/utp/test_utp_socket.nim
+1 −1		json_serialization.nimble
+2 −1		json_serialization/std/options.nim
+2 −1		json_serialization/stew/results.nim
+18 −1		json_serialization/writer.nim
+2 −1		tests/test_all.nim
+101 −0		tests/test_writer.nim
+14 −25		README.md
+830 −742		metrics.nim
+11 −8		metrics.nimble
+28 −29		metrics/chronicles_support.nim
+117 −103		metrics/chronos_httpserver.nim
+5 −4		metrics/common.nim
+219 −0		metrics/export_backend.nim
+0 −58		metrics/stdlib_httpserver.nim
+2 −0		nim.cfg
+1 −9		tests/chronicles_tests.nim
+26 −18		tests/main_tests.nim
+0 −21		tests/stdlib_server_tests.nim
+19 −1		.github/workflows/ci.yml
+2 −0		.gitignore
+11 −0		CHANGELOG.md
+0 −2,036		docs/dochack.js
+0 −1,016		docs/nimdoc.out.css
+0 −1,294		docs/regex.html
+0 −78		docs/regex.idx
+1 −0		docs/regex/.keep
+0 −288		docs/regex/common.html
+0 −10		docs/regex/common.idx
+0 −173		docs/regex/compiler.html
+0 −2		docs/regex/compiler.idx
+0 −183		docs/regex/dotgraph.html
+0 −3		docs/regex/dotgraph.idx
+0 −201		docs/regex/exptransformation.html
+0 −3		docs/regex/exptransformation.idx
+0 −173		docs/regex/exptype.html
+0 −2		docs/regex/exptype.idx
+0 −201		docs/regex/litopt.html
+0 −3		docs/regex/litopt.idx
+0 −199		docs/regex/nfa.html
+0 −4		docs/regex/nfa.idx
+0 −274		docs/regex/nfafindall.html
+0 −7		docs/regex/nfafindall.idx
+0 −276		docs/regex/nfafindall2.html
+0 −7		docs/regex/nfafindall2.idx
+0 −161		docs/regex/nfamacro.html
+0 −1		docs/regex/nfamacro.idx
+0 −257		docs/regex/nfamatch.html
+0 −6		docs/regex/nfamatch.idx
+0 −257		docs/regex/nfamatch2.html
+0 −6		docs/regex/nfamatch2.idx
+0 −860		docs/regex/nfatype.html
+0 −59		docs/regex/nfatype.idx
+0 −891		docs/regex/nimdoc.out.css
+0 −183		docs/regex/nodematch.html
+0 −3		docs/regex/nodematch.idx
+0 −443		docs/regex/nodetype.html
+0 −78		docs/regex/nodetype.idx
+0 −160		docs/regex/parser.html
+0 −1		docs/regex/parser.idx
+0 −359		docs/regex/scanner.html
+0 −15		docs/regex/scanner.idx
+0 −594		docs/regex/types.html
+0 −89		docs/regex/types.idx
+0 −1,246		docs/theindex.html
+10 −6		regex.nimble
+94 −40		src/regex.nim
+10 −8		src/regex/compiler.nim
+45 −11		src/regex/exptransformation.nim
+63 −10		src/regex/litopt.nim
+20 −11		src/regex/nfafindall2.nim
+0 −4		src/regex/nfamacro.nim
+54 −21		src/regex/nfamatch2.nim
+16 −9		src/regex/nfatype.nim
+0 −8		src/regex/nodematch.nim
+3 −2		src/regex/parser.nim
+11 −2		src/regex/scanner.nim
+10 −7		src/regex/types.nim
+175 −0		tests/tests2.nim
+698 −0		tests/tests_misc.nim
+25 −33		.github/workflows/ci.yml
+90 −54		README.md
+16 −0		config.nims
+1 −1		tests/test_features.nim
+98 −1		tests/test_misc.nim
+30 −0		tests/test_parser.nim
+21 −18		tests/test_spec.nim
+1 −1		toml_serialization.nimble
+232 −172		toml_serialization/lexer.nim
+61 −136		toml_serialization/reader.nim
+1 −0		toml_serialization/types.nim
+7 −7		toml_serialization/writer.nim