Merge pull request #334 from pipermerriam/piper/start-content-process…

…ing-from-random-key

Content processing starts at random key

ddht/v5_1/alexandria/content_manager.py

@@ -1,9 +1,10 @@
 import logging
+import secrets
 from typing import Optional
 
 from async_service import Service
 from async_service import external_trio_api as external_api
-from eth_typing import Hash32
+from eth_typing import Hash32, NodeID
 from eth_utils import humanize_seconds
 from eth_utils.toolz import first, take
 import ssz
@@ -135,13 +136,20 @@ async def _periodically_advertise_content(self) -> None:
             if not total_keys:
                 continue
 
+            first_key = first(
+                self.content_storage.iter_closest(NodeID(secrets.token_bytes(32)))
+            )
+
             self.logger.info(
-                "content-processing-starting: total=%d", total_keys,
+                "content-processing-starting: total=%d  start=%s",
+                total_keys,
+                first_key.hex(),
             )
 
             processed_keys = 0
 
-            last_key: Optional[ContentKey] = None
+            last_key = first_key
+            has_wrapped_around = False
 
             while self.manager.is_running:
                 elapsed = trio.current_time() - start_at
@@ -160,12 +168,17 @@ async def _periodically_advertise_content(self) -> None:
                     content_keys = content_keys[1:]
 
                 if not content_keys:
-                    break
+                    last_key = None
+                    has_wrapped_around = True
+                    continue
 
                 for content_key in content_keys:
                     await send_channel.send(content_key)
 
                 last_key = content_keys[-1]
+                if has_wrapped_around and last_key >= first_key:
+                    break
+
                 processed_keys += len(content_keys)
                 progress = processed_keys * 100 / total_keys
 

tests/core/v5_1/alexandria/test_message_encoding.py

@@ -1,6 +1,6 @@
 from eth_enr.tools.factories import ENRFactory
 from eth_keys import keys
-from hypothesis import given
+from hypothesis import given, settings
 from hypothesis import strategies as st
 import rlp
 
@@ -82,6 +82,7 @@ def test_found_nodes_message_encoding_round_trip(num_enr_records):
 ).map(lambda key_and_root: Advertisement.create(*key_and_root, PRIVATE_KEY))
 
 
+@settings(deadline=500)
 @given(advertisements=st.lists(advertisement_st, min_size=1, max_size=5).map(tuple),)
 def test_advertisement_message_encoding_round_trip(advertisements):
     message = AdvertiseMessage(advertisements)