better naming

This commit is contained in:
Sergei Tikhomirov 2025-02-28 16:09:22 +01:00
parent 9c235796a1
commit b2ef56f6d1

View File

@ -26,21 +26,21 @@ import
suite "Waku Lightpush Client": suite "Waku Lightpush Client":
var var
handlerFuture {.threadvar.}: Future[(PubsubTopic, WakuMessage)] handlerFuture {.threadvar.}: Future[(PubsubTopic, WakuMessage)]
handlerFutureNoLightpush {.threadvar.}: Future[void] handlerFutureFailsLightpush {.threadvar.}: Future[void]
handler {.threadvar.}: PushMessageHandler handler {.threadvar.}: PushMessageHandler
handlerNoLightpush {.threadvar.}: PushMessageHandler handlerFailsLightpush {.threadvar.}: PushMessageHandler
serverSwitch {.threadvar.}: Switch serverSwitch {.threadvar.}: Switch
serverSwitchNoLightpush {.threadvar.}: Switch serverSwitchFailsLightpush {.threadvar.}: Switch
clientSwitch {.threadvar.}: Switch clientSwitch {.threadvar.}: Switch
server {.threadvar.}: WakuLightPush server {.threadvar.}: WakuLightPush
serverNoLightpush {.threadvar.}: WakuLightPush serverFailsLightpush {.threadvar.}: WakuLightPush
client {.threadvar.}: WakuLightPushClient client {.threadvar.}: WakuLightPushClient
serverRemotePeerInfo {.threadvar.}: RemotePeerInfo serverRemotePeerInfo {.threadvar.}: RemotePeerInfo
serverRemotePeerInfoNoLightpush {.threadvar.}: RemotePeerInfo serverRemotePeerInfoFailsLightpush {.threadvar.}: RemotePeerInfo
clientPeerId {.threadvar.}: PeerId clientPeerId {.threadvar.}: PeerId
pubsubTopic {.threadvar.}: PubsubTopic pubsubTopic {.threadvar.}: PubsubTopic
@ -61,29 +61,29 @@ suite "Waku Lightpush Client":
return ok() return ok()
# A Lightpush server that fails # A Lightpush server that fails
handlerFutureNoLightpush = newFuture[void]() handlerFutureFailsLightpush = newFuture[void]()
handlerNoLightpush = proc( handlerFailsLightpush = proc(
peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
): Future[WakuLightPushResult[void]] {.async.} = ): Future[WakuLightPushResult[void]] {.async.} =
handlerFutureNoLightpush.complete() handlerFutureFailsLightpush.complete()
return err(handlerError) return err(handlerError)
serverSwitch = newTestSwitch() serverSwitch = newTestSwitch()
serverSwitchNoLightpush = newTestSwitch() serverSwitchFailsLightpush = newTestSwitch()
clientSwitch = newTestSwitch() clientSwitch = newTestSwitch()
server = await newTestWakuLightpushNode(serverSwitch, handler) server = await newTestWakuLightpushNode(serverSwitch, handler)
serverNoLightpush = serverFailsLightpush =
await newTestWakuLightpushNode(serverSwitchNoLightpush, handlerNoLightpush) await newTestWakuLightpushNode(serverSwitchFailsLightpush, handlerFailsLightpush)
client = newTestWakuLightpushClient(clientSwitch) client = newTestWakuLightpushClient(clientSwitch)
await allFutures( await allFutures(
serverSwitch.start(), serverSwitchNoLightpush.start(), clientSwitch.start() serverSwitch.start(), serverSwitchFailsLightpush.start(), clientSwitch.start()
) )
serverRemotePeerInfo = serverSwitch.peerInfo.toRemotePeerInfo() serverRemotePeerInfo = serverSwitch.peerInfo.toRemotePeerInfo()
serverRemotePeerInfoNoLightpush = serverRemotePeerInfoFailsLightpush =
serverSwitchNoLightpush.peerInfo.toRemotePeerInfo() serverSwitchFailsLightpush.peerInfo.toRemotePeerInfo()
clientPeerId = clientSwitch.peerInfo.peerId clientPeerId = clientSwitch.peerInfo.peerId
pubsubTopic = DefaultPubsubTopic pubsubTopic = DefaultPubsubTopic
contentTopic = DefaultContentTopic contentTopic = DefaultContentTopic
@ -91,7 +91,7 @@ suite "Waku Lightpush Client":
asyncTeardown: asyncTeardown:
await allFutures( await allFutures(
clientSwitch.stop(), serverSwitch.stop(), serverSwitchNoLightpush.stop() clientSwitch.stop(), serverSwitch.stop(), serverSwitchFailsLightpush.stop()
) )
suite "Verification of PushRequest Payload": suite "Verification of PushRequest Payload":
@ -314,12 +314,12 @@ suite "Waku Lightpush Client":
asyncTest "Handle Error": asyncTest "Handle Error":
# When publishing a payload # When publishing a payload
let publishResponse = let publishResponse =
await client.publish(pubsubTopic, message, serverRemotePeerInfoNoLightpush) await client.publish(pubsubTopic, message, serverRemotePeerInfoFailsLightpush)
# Then the response is negative # Then the response is negative
check: check:
publishResponse.error() == handlerError publishResponse.error() == handlerError
(await handlerFutureNoLightpush.waitForResult()).isOk() (await handlerFutureFailsLightpush.waitForResult()).isOk()
suite "Verification of PushResponse Payload": suite "Verification of PushResponse Payload":
asyncTest "Positive Responses": asyncTest "Positive Responses":
@ -338,22 +338,22 @@ suite "Waku Lightpush Client":
asyncTest "Negative Responses": asyncTest "Negative Responses":
# Given a server that does not support Waku Lightpush # Given a server that does not support Waku Lightpush
let let
serverSwitchNoLightpush = newTestSwitch() serverSwitchFailsLightpush = newTestSwitch()
serverRemotePeerInfoNoLightpush = serverRemotePeerInfoFailsLightpush =
serverSwitchNoLightpush.peerInfo.toRemotePeerInfo() serverSwitchFailsLightpush.peerInfo.toRemotePeerInfo()
await serverSwitchNoLightpush.start() await serverSwitchFailsLightpush.start()
# When sending an invalid PushRequest # When sending an invalid PushRequest
let publishResponse = let publishResponse =
await client.publish(pubsubTopic, message, serverRemotePeerInfoNoLightpush) await client.publish(pubsubTopic, message, serverRemotePeerInfoFailsLightpush)
# Then the response is negative # Then the response is negative
check not publishResponse.isOk() check not publishResponse.isOk()
when defined(reputation): when defined(reputation):
check client.reputationManager.getReputation( check client.reputationManager.getReputation(
serverRemotePeerInfoNoLightpush.peerId serverRemotePeerInfoFailsLightpush.peerId
) == some(false) ) == some(false)
asyncTest "Positive Publish To Any": asyncTest "Positive Publish To Any":
@ -368,7 +368,7 @@ suite "Waku Lightpush Client":
asyncTest "Negative Publish To Any": asyncTest "Negative Publish To Any":
# add a peer that does not support the Lightpush protocol to the client's PeerManager # add a peer that does not support the Lightpush protocol to the client's PeerManager
client.peerManager.addPeer(serverRemotePeerInfoNoLightpush) client.peerManager.addPeer(serverRemotePeerInfoFailsLightpush)
# does not support Lightpush # does not support Lightpush
# When sending a PushRequest using publishToAny to the only peer that doesn't support Lightpush # When sending a PushRequest using publishToAny to the only peer that doesn't support Lightpush
@ -381,11 +381,11 @@ suite "Waku Lightpush Client":
asyncTest "Peer Selection for Lighpush": asyncTest "Peer Selection for Lighpush":
# add a peer that supports the Lightpush protocol to the client's PeerManager # add a peer that supports the Lightpush protocol to the client's PeerManager
client.peerManager.addPeer(serverRemotePeerInfo) # supports Lightpush client.peerManager.addPeer(serverRemotePeerInfo) # supports Lightpush
client.peerManager.addPeer(serverRemotePeerInfoNoLightpush) # does not support Lightpush client.peerManager.addPeer(serverRemotePeerInfoFailsLightpush) # does not support Lightpush
# FIXME: we expect the peer selection to select the peer that supports Lightpush # FIXME: we expect the peer selection to select the peer that supports Lightpush
# Expected behavior: if the first selected peer does not support Lightpush # Expected behavior: if the first selected peer does not support Lightpush
# (which should be the case for serverRemotePeerInfoNoLightpush), # (which should be the case for serverRemotePeerInfoFailsLightpush),
# then selectPeer tries again and selects serverRemotePeerInfo. # then selectPeer tries again and selects serverRemotePeerInfo.
# Observed behavior: the test either fails of succeeds randomly # Observed behavior: the test either fails of succeeds randomly
# hypothesis: selectPeer return the first random peer from the peer manager # hypothesis: selectPeer return the first random peer from the peer manager