From 59c3a366893497bb208025b39061677d490613fb Mon Sep 17 00:00:00 2001 From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> Date: Tue, 23 Jun 2026 18:20:45 +0200 Subject: [PATCH] make test compile and run --- logos_delivery/api/types.nim | 2 - .../node/health_monitor/connection_status.nim | 2 +- tests/api/test_api_subscription.nim | 52 +++++-------------- 3 files changed, 14 insertions(+), 42 deletions(-) diff --git a/logos_delivery/api/types.nim b/logos_delivery/api/types.nim index eef47557a..5757a8e82 100644 --- a/logos_delivery/api/types.nim +++ b/logos_delivery/api/types.nim @@ -9,8 +9,6 @@ import logos_delivery/waku/waku_core/[topics/content_topic, message/message, tim export content_topic, message -export content_topic, message - type MessageEnvelope* = object contentTopic*: ContentTopic diff --git a/logos_delivery/waku/node/health_monitor/connection_status.nim b/logos_delivery/waku/node/health_monitor/connection_status.nim index 3c1c5cf0f..fd0328fb7 100644 --- a/logos_delivery/waku/node/health_monitor/connection_status.nim +++ b/logos_delivery/waku/node/health_monitor/connection_status.nim @@ -1,5 +1,5 @@ import chronos, results, std/strutils -import logos_delivery/api/types +from logos_delivery/api/types import ConnectionStatus export ConnectionStatus diff --git a/tests/api/test_api_subscription.nim b/tests/api/test_api_subscription.nim index bf2851b02..d6a9c6c60 100644 --- a/tests/api/test_api_subscription.nim +++ b/tests/api/test_api_subscription.nim @@ -248,9 +248,7 @@ suite "Messaging API, SubscriptionManager": let subbedTopic = ContentTopic("/waku/2/subbed-topic/proto") let ignoredTopic = ContentTopic("/waku/2/ignored-topic/proto") - (await net.subscriber.messagingClient.subscribe(subbedTopic)).expect( - "failed to subscribe" - ) + (await net.subscriber.messagingClient.subscribe(subbedTopic)).expect("failed to subscribe") let eventManager = newReceiveEventListenerManager(net.subscriber.waku.brokerCtx, 1) defer: @@ -270,12 +268,8 @@ suite "Messaging API, SubscriptionManager": let testTopic = ContentTopic("/waku/2/unsub-test/proto") - (await net.subscriber.messagingClient.subscribe(testTopic)).expect( - "failed to subscribe" - ) - net.subscriber.messagingClient.unsubscribe(testTopic).expect( - "failed to unsubscribe" - ) + (await net.subscriber.messagingClient.subscribe(testTopic)).expect("failed to subscribe") + net.subscriber.messagingClient.unsubscribe(testTopic).expect("failed to unsubscribe") let eventManager = newReceiveEventListenerManager(net.subscriber.waku.brokerCtx, 1) defer: @@ -321,12 +315,8 @@ suite "Messaging API, SubscriptionManager": let glitchTopic = ContentTopic("/waku/2/glitch/proto") - (await net.subscriber.messagingClient.subscribe(glitchTopic)).expect( - "failed to sub" - ) - (await net.subscriber.messagingClient.subscribe(glitchTopic)).expect( - "failed to double sub" - ) + (await net.subscriber.messagingClient.subscribe(glitchTopic)).expect("failed to sub") + (await net.subscriber.messagingClient.subscribe(glitchTopic)).expect("failed to double sub") net.subscriber.messagingClient.unsubscribe(glitchTopic).expect("failed to unsub") let eventManager = newReceiveEventListenerManager(net.subscriber.waku.brokerCtx, 1) @@ -348,9 +338,7 @@ suite "Messaging API, SubscriptionManager": let testTopic = ContentTopic("/waku/2/resub-test/proto") # Subscribe - (await net.subscriber.messagingClient.subscribe(testTopic)).expect( - "Initial sub failed" - ) + (await net.subscriber.messagingClient.subscribe(testTopic)).expect("Initial sub failed") var eventManager = newReceiveEventListenerManager(net.subscriber.waku.brokerCtx, 1) discard @@ -482,9 +470,7 @@ suite "Messaging API, SubscriptionManager": await net.teardown() let testTopic = ContentTopic("/waku/2/test-content/proto") - (await net.subscriber.messagingClient.subscribe(testTopic)).expect( - "failed to subscribe" - ) + (await net.subscriber.messagingClient.subscribe(testTopic)).expect("failed to subscribe") let eventManager = newReceiveEventListenerManager(net.subscriber.waku.brokerCtx, 1) defer: @@ -505,9 +491,7 @@ suite "Messaging API, SubscriptionManager": let subbedTopic = ContentTopic("/waku/2/subbed-topic/proto") let ignoredTopic = ContentTopic("/waku/2/ignored-topic/proto") - (await net.subscriber.messagingClient.subscribe(subbedTopic)).expect( - "failed to subscribe" - ) + (await net.subscriber.messagingClient.subscribe(subbedTopic)).expect("failed to subscribe") let eventManager = newReceiveEventListenerManager(net.subscriber.waku.brokerCtx, 1) defer: @@ -527,12 +511,8 @@ suite "Messaging API, SubscriptionManager": let testTopic = ContentTopic("/waku/2/unsub-test/proto") - (await net.subscriber.messagingClient.subscribe(testTopic)).expect( - "failed to subscribe" - ) - net.subscriber.messagingClient.unsubscribe(testTopic).expect( - "failed to unsubscribe" - ) + (await net.subscriber.messagingClient.subscribe(testTopic)).expect("failed to subscribe") + net.subscriber.messagingClient.unsubscribe(testTopic).expect("failed to unsubscribe") let eventManager = newReceiveEventListenerManager(net.subscriber.waku.brokerCtx, 1) defer: @@ -581,9 +561,7 @@ suite "Messaging API, SubscriptionManager": let testTopic = ContentTopic("/waku/2/resub-test/proto") - (await net.subscriber.messagingClient.subscribe(testTopic)).expect( - "Initial sub failed" - ) + (await net.subscriber.messagingClient.subscribe(testTopic)).expect("Initial sub failed") var eventManager = newReceiveEventListenerManager(net.subscriber.waku.brokerCtx, 1) discard (await net.publishToMeshAfterEdgeReady(testTopic, "Msg 1".toBytes())).expect( @@ -675,9 +653,7 @@ suite "Messaging API, SubscriptionManager": let testTopic = ContentTopic("/waku/2/failover-test/proto") let shard = subscriber.waku.node.getRelayShard(testTopic) - (await subscriber.messagingClient.subscribe(testTopic)).expect( - "Failed to subscribe" - ) + (await subscriber.messagingClient.subscribe(testTopic)).expect("Failed to subscribe") # Wait for dialing both filter servers (HealthyThreshold = 2) check await edgePeersReached(subscriber, shard, 2) @@ -807,9 +783,7 @@ suite "Messaging API, SubscriptionManager": let testTopic = ContentTopic("/waku/2/replacement-test/proto") let shard = subscriber.waku.node.getRelayShard(testTopic) - (await subscriber.messagingClient.subscribe(testTopic)).expect( - "Failed to subscribe" - ) + (await subscriber.messagingClient.subscribe(testTopic)).expect("Failed to subscribe") # Wait for 2 confirmed peers (HealthyThreshold). The 3rd is available but not dialed. check await edgePeersReached(subscriber, shard, 2)