From 17ba9baf45379390239ee05cfdff85d60a730214 Mon Sep 17 00:00:00 2001
From: fbarbu15 <florin@status.im>
Date: Fri, 22 Mar 2024 15:55:06 +0200
Subject: [PATCH] bug fixes for nwaku 2436 and 2286 (#26)

---
 src/steps/filter.py               | 8 ++++----
 tests/filter/test_get_messages.py | 2 +-
 tests/relay/test_publish.py       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/steps/filter.py b/src/steps/filter.py
index 9cc9228a28..39b45cd541 100644
--- a/src/steps/filter.py
+++ b/src/steps/filter.py
@@ -127,7 +127,7 @@ class StepsFilter:
             {"requestId": request_id, "contentFilters": content_topic_list, "pubsubTopic": pubsub_topic}
         )
         assert filter_sub_response["requestId"] == request_id
-        assert filter_sub_response["statusDesc"] in ["OK", ""]  # until https://github.com/waku-org/nwaku/issues/2286 is fixed
+        assert filter_sub_response["statusDesc"] in ["OK"]
 
     @allure.step
     def subscribe_optional_filter_nodes(self, content_topic_list, pubsub_topic=None):
@@ -168,7 +168,7 @@ class StepsFilter:
         else:
             assert delete_sub_response["requestId"] == subscription["requestId"]
         if status is None:
-            assert delete_sub_response["statusDesc"] in ["OK", ""]  # until https://github.com/waku-org/nwaku/issues/2286 is fixed
+            assert delete_sub_response["statusDesc"] in ["OK"]
         else:
             assert status in delete_sub_response["statusDesc"]
 
@@ -178,7 +178,7 @@ class StepsFilter:
             node = self.node2
         delete_sub_response = node.delete_all_filter_subscriptions(request_id)
         assert delete_sub_response["requestId"] == request_id["requestId"]
-        assert delete_sub_response["statusDesc"] in ["OK", ""]  # until https://github.com/waku-org/nwaku/issues/2286 is fixed
+        assert delete_sub_response["statusDesc"] in ["OK"]
 
     @allure.step
     def ping_filter_subscriptions(self, request_id, node=None):
@@ -186,7 +186,7 @@ class StepsFilter:
             node = self.node2
         ping_sub_response = node.ping_filter_subscriptions(request_id)
         assert ping_sub_response["requestId"] == request_id
-        assert ping_sub_response["statusDesc"] in ["OK", ""]  # until https://github.com/waku-org/nwaku/issues/2286 is fixed
+        assert ping_sub_response["statusDesc"] in ["OK"]
 
     def ping_without_filter_subscription(self, node=None):
         try:
diff --git a/tests/filter/test_get_messages.py b/tests/filter/test_get_messages.py
index 6aab15f1b1..3fff711a2c 100644
--- a/tests/filter/test_get_messages.py
+++ b/tests/filter/test_get_messages.py
@@ -42,7 +42,7 @@ class TestFilterGetMessages(StepsFilter):
     def test_filter_get_message_with_meta(self):
         self.check_published_message_reaches_filter_peer(self.create_message(meta=to_base64(self.test_payload)))
 
-    @pytest.mark.xfail(reason="Bug reported: https://github.com/waku-org/nwaku/issues/2436")
+    @pytest.mark.xfail("go-waku" in NODE_2, reason="Bug reported: https://github.com/waku-org/go-waku/issues/1068")
     def test_filter_get_message_with_ephemeral(self):
         failed_ephemeral = []
         for ephemeral in [True, False]:
diff --git a/tests/relay/test_publish.py b/tests/relay/test_publish.py
index ac683d9e45..832064383e 100644
--- a/tests/relay/test_publish.py
+++ b/tests/relay/test_publish.py
@@ -168,7 +168,7 @@ class TestRelayPublish(StepsRelay):
         except Exception as ex:
             assert "Bad Request" in str(ex)
 
-    @pytest.mark.xfail(reason="Bug reported: https://github.com/waku-org/nwaku/issues/2436")
+    @pytest.mark.xfail("go-waku" in NODE_2, reason="Bug reported: https://github.com/waku-org/go-waku/issues/1068")
     def test_publish_with_ephemeral(self):
         failed_ephemeral = []
         for ephemeral in [True, False]: