From 790e71db48e4eee9cfad14dc752628e0869a4cb5 Mon Sep 17 00:00:00 2001 From: fbarbu15 Date: Fri, 13 Sep 2024 14:38:23 +0300 Subject: [PATCH] chore/fixes for nwaku updates (#72) * fixes * fixes * fixes --- src/test_data.py | 4 ---- tests/sharding/test_filter.py | 7 +++++-- tests/sharding/test_running_nodes_auto_sharding.py | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/test_data.py b/src/test_data.py index bc581c1850..ad7b579eab 100644 --- a/src/test_data.py +++ b/src/test_data.py @@ -222,8 +222,6 @@ METRICS_WITH_INITIAL_VALUE_ZERO = [ "libp2p_pubsub_sig_verify_failure_total", "libp2p_pubsub_disconnects_over_non_priority_queue_limit_total", "libp2p_pubsub_peers", - "libp2p_pubsub_topics", - "libp2p_pubsub_subscriptions_total", "libp2p_pubsub_unsubscriptions_total", "libp2p_pubsub_validation_success_total", "libp2p_pubsub_validation_failure_total", @@ -234,8 +232,6 @@ METRICS_WITH_INITIAL_VALUE_ZERO = [ 'libp2p_gossipsub_peers_per_topic_mesh{topic="other"}', 'libp2p_gossipsub_peers_per_topic_fanout{topic="other"}', 'libp2p_gossipsub_peers_per_topic_gossipsub{topic="other"}', - "libp2p_gossipsub_under_dout_topics", - "libp2p_gossipsub_no_peers_topics", "libp2p_gossipsub_low_peers_topics", "libp2p_gossipsub_healthy_peers_topics", "libp2p_gossipsub_failed_publish_total", diff --git a/tests/sharding/test_filter.py b/tests/sharding/test_filter.py index 4abacddc65..caf5761170 100644 --- a/tests/sharding/test_filter.py +++ b/tests/sharding/test_filter.py @@ -34,7 +34,7 @@ class TestFilterStaticSharding(StepsSharding): class TestFilterAutoSharding(StepsSharding): def test_filter_works_with_auto_sharding(self): self.setup_first_relay_node_with_filter( - cluster_id=self.auto_cluster, content_topic=self.test_content_topic, pubsub_topic=self.test_pubsub_topic + cluster_id=self.auto_cluster, content_topic=self.test_content_topic, pubsub_topic=self.test_pubsub_topic, num_shards_in_network=1 ) self.setup_second_node_as_filter(cluster_id=self.auto_cluster, content_topic=self.test_content_topic, pubsub_topic=self.test_pubsub_topic) self.subscribe_first_relay_node(content_topics=[self.test_content_topic]) @@ -43,7 +43,10 @@ class TestFilterAutoSharding(StepsSharding): def test_filter_auto_sharding_multiple_content_topics(self): self.setup_first_relay_node_with_filter( - cluster_id=self.auto_cluster, content_topic=CONTENT_TOPICS_DIFFERENT_SHARDS, pubsub_topic=PUBSUB_TOPICS_SAME_CLUSTER + cluster_id=self.auto_cluster, + content_topic=CONTENT_TOPICS_DIFFERENT_SHARDS, + pubsub_topic=PUBSUB_TOPICS_SAME_CLUSTER, + num_shards_in_network=8, ) self.setup_second_node_as_filter( cluster_id=self.auto_cluster, content_topic=CONTENT_TOPICS_DIFFERENT_SHARDS, pubsub_topic=self.test_pubsub_topic diff --git a/tests/sharding/test_running_nodes_auto_sharding.py b/tests/sharding/test_running_nodes_auto_sharding.py index f0063dadff..37e1979500 100644 --- a/tests/sharding/test_running_nodes_auto_sharding.py +++ b/tests/sharding/test_running_nodes_auto_sharding.py @@ -93,7 +93,7 @@ class TestRunningNodesAutosharding(StepsSharding): self.check_published_message_reaches_relay_peer(pubsub_topic=self.test_pubsub_topic) def test_sender_uses_auto_api_receiver_uses_regular_api(self): - self.setup_main_relay_nodes(cluster_id=self.auto_cluster, pubsub_topic=self.test_pubsub_topic) + self.setup_main_relay_nodes(cluster_id=self.auto_cluster, pubsub_topic=self.test_pubsub_topic, num_shards_in_network=1) self.subscribe_first_relay_node(content_topics=[self.test_content_topic]) self.subscribe_second_relay_node(pubsub_topics=[self.test_pubsub_topic]) self.relay_message(self.node1, self.create_message(contentTopic=self.test_content_topic))