logos-messaging/logos-messaging-interop-tests
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-interop-tests.git synced 2026-01-09 17:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
Florin Barbu 2024-05-20 13:58:34 +03:00
commit 5ef5aac3fc
No known key found for this signature in database
GPG Key ID: 593D6DBC6D9E5095
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/node/waku_message.py
View File

@ -13,19 +13,6 @@ class MessageRpcResponse:
timestamp: Optional[int] timestamp: Optional[int]
ephemeral: Optional[bool] ephemeral: Optional[bool]
meta: Optional[str] meta: Optional[str]
rateLimitProof: Optional[Union[dict, str]] = field(default_factory=dict)
rate_limit_proof: Optional[dict] = field(default_factory=dict)
@dataclass
class MessageRpcResponseStore:
payload: str
content_topic: str
version: Optional[int]
timestamp: Optional[int]
ephemeral: Optional[bool]
meta: Optional[str]
rateLimitProof: Optional[Union[dict, str]] = field(default_factory=dict)
rate_limit_proof: Optional[dict] = field(default_factory=dict) rate_limit_proof: Optional[dict] = field(default_factory=dict)
@ -43,10 +30,7 @@ class WakuMessage:
return f"Incorrect field: {field_name}. Published: {sent_message[field_name]} Received: {getattr(message, field_name)}" return f"Incorrect field: {field_name}. Published: {sent_message[field_name]} Received: {getattr(message, field_name)}"
assert message.payload == sent_message["payload"], assert_fail_message("payload") assert message.payload == sent_message["payload"], assert_fail_message("payload")
if self.schema == MessageRpcResponse: assert message.contentTopic == sent_message["contentTopic"], assert_fail_message("contentTopic")
assert message.contentTopic == sent_message["contentTopic"], assert_fail_message("contentTopic")
else:
assert message.content_topic == sent_message["contentTopic"], assert_fail_message("content_topic")
if sent_message.get("timestamp") is not None: if sent_message.get("timestamp") is not None:
if isinstance(sent_message["timestamp"], float): if isinstance(sent_message["timestamp"], float):
assert math.isclose(float(message.timestamp), sent_message["timestamp"], rel_tol=1e-9), assert_fail_message("timestamp") assert math.isclose(float(message.timestamp), sent_message["timestamp"], rel_tol=1e-9), assert_fail_message("timestamp")

8
src/steps/store.py
View File

@ -3,7 +3,7 @@ from src.libs.custom_logger import get_custom_logger
import pytest import pytest
import allure import allure
from src.libs.common import delay from src.libs.common import delay
from src.node.waku_message import MessageRpcResponse, MessageRpcResponseStore, WakuMessage from src.node.waku_message import WakuMessage
from src.env_vars import ( from src.env_vars import (
ADDITIONAL_NODES, ADDITIONAL_NODES,
NODE_1, NODE_1,
@ -180,15 +180,13 @@ class StepsStore(StepsCommon):
assert self.store_response["messages"], f"Peer {node.image} couldn't find any messages. Actual response: {self.store_response}" assert self.store_response["messages"], f"Peer {node.image} couldn't find any messages. Actual response: {self.store_response}"
assert len(self.store_response["messages"]) >= 1, "Expected at least 1 message but got none" assert len(self.store_response["messages"]) >= 1, "Expected at least 1 message but got none"
store_message_index = -1 # we are looking for the last and most recent message in the store store_message_index = -1 # we are looking for the last and most recent message in the store
waku_message = WakuMessage( waku_message = WakuMessage(self.store_response["messages"][store_message_index:])
self.store_response["messages"][store_message_index:], schema=MessageRpcResponseStore if node.is_nwaku() else MessageRpcResponse
)
if store_v == "v1": if store_v == "v1":
waku_message.assert_received_message(message_to_check) waku_message.assert_received_message(message_to_check)
else: else:
expected_hash = self.compute_message_hash(pubsub_topic, message_to_check) expected_hash = self.compute_message_hash(pubsub_topic, message_to_check)
assert ( assert (
expected_hash == self.store_response["messages"][store_message_index]["message_hash"]["data"] expected_hash == self.store_response["messages"][store_message_index]["messageHash"]["data"]
), f"Message hash returned by store doesn't match the computed message hash {expected_hash}" ), f"Message hash returned by store doesn't match the computed message hash {expected_hash}"
@allure.step @allure.step