mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-06-16 14:39:34 +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)
48 lines
1.3 KiB
Nim
48 lines
1.3 KiB
Nim
import libp2p/crypto/rng
|
|
import chronos, bearssl/rand, eth/[keys, p2p]
|
|
|
|
import libp2p/crypto/crypto
|
|
|
|
var nextPort = 30303
|
|
|
|
proc localAddress*(port: int): Address =
|
|
let port = Port(port)
|
|
result = Address(udpPort: port, tcpPort: port, ip: parseIpAddress("127.0.0.1"))
|
|
|
|
proc setupTestNode*(
|
|
rng: crypto.Rng, capabilities: varargs[ProtocolInfo, `protocolInfo`]
|
|
): EthereumNode =
|
|
let
|
|
keys1 = keys.KeyPair.random(keys.newRng()[])
|
|
address = localAddress(nextPort)
|
|
result = newEthereumNode(
|
|
keys1,
|
|
address,
|
|
NetworkId(1),
|
|
addAllCapabilities = false,
|
|
bindUdpPort = address.udpPort, # Assume same as external
|
|
bindTcpPort = address.tcpPort, # Assume same as external
|
|
rng = rng,
|
|
)
|
|
nextPort.inc
|
|
for capability in capabilities:
|
|
result.addCapability capability
|
|
|
|
# Copied from here: https://github.com/status-im/nim-libp2p/blob/d522537b19a532bc4af94fcd146f779c1f23bad0/tests/helpers.nim#L28
|
|
type RngWrap = object
|
|
rng: crypto.Rng
|
|
|
|
var rngVar: RngWrap
|
|
|
|
proc getRng(): crypto.Rng =
|
|
# TODO if `rngVar` is a threadvar like it should be, there are random and
|
|
# spurious compile failures on mac - this is not gcsafe but for the
|
|
# purpose of the tests, it's ok as long as we only use a single thread
|
|
{.gcsafe.}:
|
|
if rngVar.rng.isNil:
|
|
rngVar.rng = crypto.newRng()
|
|
rngVar.rng
|
|
|
|
template rng*(): crypto.Rng =
|
|
getRng()
|