StarMirror/py-libp2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix:

Browse Source 
`_is_subscribed_to_msg` need only subscribe to one of the topics
This commit is contained in:
NIC619 2019-08-05 18:20:04 +08:00
parent a2efd03dfa
commit b96ef0e6c7
No known key found for this signature in database
GPG Key ID: 570C35F5C2D51B17
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libp2p/pubsub/pubsub.py
View File

@ -1,17 +1,7 @@
import asyncio import asyncio
from collections import namedtuple from collections import namedtuple
import time import time
from typing import ( from typing import TYPE_CHECKING, Any, Awaitable, Callable, Dict, Iterable, List, Tuple, Union
Any,
Awaitable,
Callable,
Dict,
Iterable,
List,
Tuple,
Union,
TYPE_CHECKING,
)
from lru import LRU from lru import LRU
@ -381,9 +371,7 @@ class Pubsub:
async_topic_validator_futures = [] async_topic_validator_futures = []
for topic_validator in self.get_msg_validators(msg): for topic_validator in self.get_msg_validators(msg):
if topic_validator.is_async: if topic_validator.is_async:
async_topic_validator_futures.append( async_topic_validator_futures.append(topic_validator.validator(msg_forwarder, msg))
topic_validator.validator(msg_forwarder, msg)
)
else: else:
sync_topic_validators.append(topic_validator.validator) sync_topic_validators.append(topic_validator.validator)
@ -448,4 +436,4 @@ class Pubsub:
def _is_subscribed_to_msg(self, msg: rpc_pb2.Message) -> bool: def _is_subscribed_to_msg(self, msg: rpc_pb2.Message) -> bool:
if not self.my_topics: if not self.my_topics:
return False return False
return all([topic in self.my_topics for topic in msg.topicIDs]) return any([topic in self.my_topics for topic in msg.topicIDs])

8
tests/pubsub/test_pubsub.py
View File

@ -183,16 +183,10 @@ async def test_get_msg_validators(pubsubs_fsub):
@pytest.mark.parametrize("num_hosts", (1,)) @pytest.mark.parametrize("num_hosts", (1,))
@pytest.mark.parametrize( @pytest.mark.parametrize(
"is_topic_1_val_passed, is_topic_2_val_passed", "is_topic_1_val_passed, is_topic_2_val_passed", ((False, True), (True, False), (True, True))
(
(False, True),
(True, False),
(True, True),
)
) )
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_validate_msg(pubsubs_fsub, is_topic_1_val_passed, is_topic_2_val_passed): async def test_validate_msg(pubsubs_fsub, is_topic_1_val_passed, is_topic_2_val_passed):
def passed_sync_validator(peer_id, msg): def passed_sync_validator(peer_id, msg):
return True return True