mirror of
https://github.com/logos-messaging/logos-delivery.git
synced 2026-07-24 05:23:16 +00:00
6837ae0c1f
* bump nim-libp2p pin to v2.0.0 tag * bump json_rpc to v0.6.1, lsquic to v0.5.1, boringssl to v0.0.8 (latest tags) * add libp2p_mix dep; repoint libp2p/protocols/mix -> libp2p_mix * pin nimble.lock: websock / protobuf_serialization / npeg / jwt * Makefile: add -d:libp2p_quic_support * regenerate nix/deps.nix (adds libp2p_mix, refreshes pins) * migrate rng ref HmacDrbgContext -> libp2p Rng across prod/channels/tests (interface-only; same DRBG) * waku_switch: TransportConfig factory; unified 2.0.0 connection limits (withMaxInOut, withMaxConnections); local MaxConnections * waku_relay/rendezvous/discv5/kademlia: v2.0.0 API (rng, config, ServiceDiscovery rename) * call Service.setup() on post-build switch services (2.0.0 split setup/start) * drop libp2p/utils/semaphore -> chronos AsyncSemaphore * add logos_delivery/waku/compat/option_valueor shim (Option[T] valueOr/withValue, dropped upstream) * add std/options where a transitive re-export was removed * add newStandardSwitch shim (libp2p removed it in 2.0.0); mounts yamux+mplex to match prod muxer * PeerId.random(rng); common.rng()/crypto.newRng(); hoist shared rng (instantiation cleanup) * update expectations for 2.0.0 defaults: DEFAULT_PROTOCOLS += /ipfs/id/push/1.0.0; agent "nim-libp2p" * drop relay reboot/reconnect test (asserted a Switch restart capability that is simply not supported) * fix up a few tests that were flaking on MacOS (libp2p upgrade may have exposed these)
33 lines
849 B
Nim
33 lines
849 B
Nim
## Polyfill: `valueOr` / `withValue` templates for `std/options.Option[T]`.
|
|
##
|
|
## Previously provided transitively by `libp2p/utility`, removed in
|
|
## nim-libp2p PR #2162 (commit 8a9943145). logos-delivery uses these
|
|
## templates pervasively on `Option[T]`.
|
|
|
|
{.push raises: [].}
|
|
|
|
import std/[macros, options]
|
|
|
|
template valueOr*[T](self: Option[T], body: untyped): untyped =
|
|
let temp = (self)
|
|
if temp.isSome:
|
|
temp.get()
|
|
else:
|
|
body
|
|
|
|
template withValue*[T](self: Option[T], value, body: untyped): untyped =
|
|
let temp = (self)
|
|
if temp.isSome:
|
|
let `value` {.inject.} = temp.get()
|
|
body
|
|
|
|
macro withValue*[T](self: Option[T], value, body, elseStmt: untyped): untyped =
|
|
let elseBody = elseStmt[0]
|
|
quote:
|
|
let temp = (`self`)
|
|
if temp.isSome:
|
|
let `value` {.inject.} = temp.get()
|
|
`body`
|
|
else:
|
|
`elseBody`
|