added dedicated test file and moved timed_cache to tools

libp2p/pubsub/gossipsub.py

@@ -88,7 +88,7 @@ class GossipSub(IPubsubRouter, Service):
         degree: int,
         degree_low: int,
         degree_high: int,
-        time_to_live: int,
+        time_to_live: int = 60,
         gossip_window: int = 3,
         gossip_history: int = 5,
         heartbeat_initial_delay: float = 0.1,

libp2p/pubsub/pubsub.py

@@ -11,11 +11,11 @@ import hashlib
 import logging
 import time
 from typing import (
-    TYPE_CHECKING,
     Callable,
     NamedTuple,
     cast,
 )
+from typing import Any  # noqa: F401
 
 import base58
 import trio
@@ -26,6 +26,7 @@ from libp2p.abc import (
     IPubsub,
     ISubscriptionAPI,
 )
+from libp2p.abc import IPubsubRouter  # noqa: F401
 from libp2p.crypto.keys import (
     PrivateKey,
 )
@@ -53,12 +54,12 @@ from libp2p.network.stream.exceptions import (
 from libp2p.peer.id import (
     ID,
 )
-from libp2p.timed_cache.last_seen_cache import (
-    LastSeenCache,
-)
 from libp2p.tools.async_service import (
     Service,
 )
+from libp2p.tools.timed_cache.last_seen_cache import (
+    LastSeenCache,
+)
 from libp2p.utils import (
     encode_varint_prefixed,
     read_varint_prefixed_bytes,
@@ -78,12 +79,6 @@ from .validators import (
     signature_validator,
 )
 
-if TYPE_CHECKING:
-    from typing import Any  # noqa: F401
-
-    from .abc import IPubsubRouter  # noqa: F401
-
-
 # Ref: https://github.com/libp2p/go-libp2p-pubsub/blob/40e1c94708658b155f30cf99e4574f384756d83c/topic.go#L97  # noqa: E501
 SUBSCRIPTION_CHANNEL_SIZE = 32
 
@@ -137,6 +132,7 @@ class Pubsub(Service, IPubsub):
         router: IPubsubRouter,
         cache_size: int = None,
         seen_ttl: int = 120,
+        sweep_interval: int = 60,
         strict_signing: bool = True,
         msg_id_constructor: Callable[
             [rpc_pb2.Message], bytes
@@ -188,7 +184,7 @@ class Pubsub(Service, IPubsub):
         else:
             self.sign_key = None
 
-        self.seen_messages = LastSeenCache(seen_ttl)
+        self.seen_messages = LastSeenCache(seen_ttl, sweep_interval)
 
         # Map of topics we are subscribed to blocking queues
         # for when the given topic receives a message