From 07fc98a79bee2452442d35d5c13bec4cae223cc2 Mon Sep 17 00:00:00 2001 From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> Date: Tue, 23 Jun 2026 23:54:33 +0200 Subject: [PATCH] Reconcile master's new send tests to LogosDelivery API after rebase master commits #3965/#3669-followup added two test cases (Edge lightpush delivery #3847, store-validation timeout) written against the removed waku/api.nim createNode helper. Rewrite them to the LogosDelivery shape: createNode -> LogosDelivery.new, node.node -> node.waku.node, node.brokerCtx -> node.waku.brokerCtx, node.send -> node.messagingClient.send, and drop the now-implicit mountMessagingClient calls (LogosDelivery.new mounts the client internally). Co-Authored-By: Claude Opus 4.8 --- tests/api/test_api_send.nim | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/tests/api/test_api_send.nim b/tests/api/test_api_send.nim index 13ec57c83..f64715592 100644 --- a/tests/api/test_api_send.nim +++ b/tests/api/test_api_send.nim @@ -355,22 +355,20 @@ suite "Waku API - Send": asyncTest "Edge sender delivers via lightpush (no relay)": ## Reproduces issue #3847: an Edge node (no relay mounted) that is only ## connected to a lightpush-capable peer must deliver through lightpush. - var node: Waku + var node: LogosDelivery lockNewGlobalBrokerContext: - node = (await createNode(createApiNodeConf(cli_args.WakuMode.Edge))).valueOr: + node = (await LogosDelivery.new(createApiNodeConf(cli_args.WakuMode.Edge))).valueOr: raiseAssert error - node.mountMessagingClient().isOkOr: - raiseAssert "Failed to mount messaging: " & error (await node.start()).isOkOr: raiseAssert "Failed to start Waku node: " & error # Edge node has no relay; its only path to the network is the # lightpush peer it is connected to. - await node.node.connectToNodes(@[lightpushNodePeerInfo]) + await node.waku.node.connectToNodes(@[lightpushNodePeerInfo]) - check node.node.wakuRelay.isNil() + check node.waku.node.wakuRelay.isNil() - let eventManager = newSendEventListenerManager(node.brokerCtx) + let eventManager = newSendEventListenerManager(node.waku.brokerCtx) defer: await eventManager.teardown() @@ -378,7 +376,7 @@ suite "Waku API - Send": ContentTopic("/waku/2/default-content/proto"), "test payload" ) - let requestId = (await node.send(envelope)).valueOr: + let requestId = (await node.messagingClient.send(envelope)).valueOr: raiseAssert error const eventTimeout = 10.seconds @@ -497,19 +495,19 @@ suite "Waku API - Send": # it can answer store queries but never holds the published message. let isolatedStoreNodePeerInfo = isolatedStoreNode.peerInfo.toRemotePeerInfo() - var node: Waku + var node: LogosDelivery lockNewGlobalBrokerContext: - node = (await createNode(createApiNodeConf())).valueOr: + node = (await LogosDelivery.new(createApiNodeConf())).valueOr: raiseAssert error - node.mountMessagingClient().isOkOr: - raiseAssert "Failed to mount messaging: " & error (await node.start()).isOkOr: raiseAssert "Failed to start Waku node: " & error # Propagate via relayNode1; store queries can only reach the isolated store node. - await node.node.connectToNodes(@[relayNode1PeerInfo, isolatedStoreNodePeerInfo]) + await node.waku.node.connectToNodes( + @[relayNode1PeerInfo, isolatedStoreNodePeerInfo] + ) - let eventManager = newSendEventListenerManager(node.brokerCtx) + let eventManager = newSendEventListenerManager(node.waku.brokerCtx) defer: await eventManager.teardown() @@ -517,7 +515,7 @@ suite "Waku API - Send": ContentTopic("/waku/2/default-content/proto"), "test payload" ) - let requestId = (await node.send(envelope)).valueOr: + let requestId = (await node.messagingClient.send(envelope)).valueOr: raiseAssert error # Must outlive MaxTimeInCache (1 min) so the store-validation timeout drop fires.