Merge pull request #1210 from carver/header-sync-queues

Sync headers in queue instead of batch, add Peer types

Author: carver

eth/chains/base.py

@@ -295,7 +295,10 @@ def validate_uncles(self, block: BaseBlock) -> None:
 
     @abstractmethod
     def validate_chain(
-            self, chain: Tuple[BlockHeader, ...], seal_check_random_sample_rate: int = 1) -> None:
+            self,
+            parent: BlockHeader,
+            chain: Tuple[BlockHeader, ...],
+            seal_check_random_sample_rate: int = 1) -> None:
         raise NotImplementedError("Chain classes must implement this method")
 
 
@@ -763,8 +766,11 @@ def validate_uncles(self, block: BaseBlock) -> None:
             uncle_vm_class.validate_uncle(block, uncle, uncle_parent)
 
     def validate_chain(
-            self, chain: Tuple[BlockHeader, ...], seal_check_random_sample_rate: int = 1) -> None:
-        parent = self.chaindb.get_block_header_by_hash(chain[0].parent_hash)
+            self,
+            parent: BlockHeader,
+            chain: Tuple[BlockHeader, ...],
+            seal_check_random_sample_rate: int = 1) -> None:
+
         all_indices = list(range(len(chain)))
         if seal_check_random_sample_rate == 1:
             headers_to_check_seal = set(all_indices)
@@ -865,5 +871,8 @@ async def coro_import_block(self,
         raise NotImplementedError()
 
     async def coro_validate_chain(
-            self, chain: Tuple[BlockHeader, ...], seal_check_random_sample_rate: int = 1) -> None:
+            self,
+            parent: BlockHeader,
+            chain: Tuple[BlockHeader, ...],
+            seal_check_random_sample_rate: int = 1) -> None:
         raise NotImplementedError()

p2p/nat.py

@@ -160,6 +160,8 @@ async def _discover_upnp_devices(self) -> AsyncGenerator[upnpclient.upnp.Device,
         except TimeoutError:
             self.logger.info("Timeout waiting for UPNP-enabled devices")
             return
+        else:
+            self.logger.debug("Found %d candidate NAT devices", len(devices))
 
         # If there are no UPNP devices we can exit early
         if not devices:

p2p/service.py

@@ -128,16 +128,16 @@ def run_task(self, awaitable: Awaitable[Any]) -> None:
         If it raises OperationCancelled, that is caught and ignored.
         """
         async def _run_task_wrapper() -> None:
-            self.logger.debug("Running task %s", awaitable)
+            self.logger.trace("Running task %s", awaitable)
             try:
                 await awaitable
             except OperationCancelled:
                 pass
             except Exception as e:
                 self.logger.warning("Task %s finished unexpectedly: %s", awaitable, e)
-                self.logger.warning("Task failure traceback", exc_info=True)
+                self.logger.debug("Task failure traceback", exc_info=True)
             else:
-                self.logger.debug("Task %s finished with no errors", awaitable)
+                self.logger.trace("Task %s finished with no errors", awaitable)
         self._tasks.add(asyncio.ensure_future(_run_task_wrapper()))
 
     def run_child_service(self, child_service: 'BaseService') -> None:

setup.py

@@ -44,11 +44,11 @@
         "web3==4.4.1",
     ],
     'test': [
-        "hypothesis==3.44.26",
+        "hypothesis==3.69.5",
         # pinned to <3.7 until async fixtures work again
         # https://github.com/pytest-dev/pytest-asyncio/issues/89
         "pytest>=3.6,<3.7",
-        "pytest-asyncio==0.8.0",
+        "pytest-asyncio==0.9.0",
         "pytest-cov==2.5.1",
         "pytest-watch>=4.1.0,<5",
         "pytest-xdist==1.18.1",

tests/p2p/test_service.py

@@ -26,11 +26,16 @@ async def _run(self):
 async def test_daemon_exit_causes_parent_cancellation():
     service = ParentService()
     asyncio.ensure_future(service.run())
+
     await asyncio.sleep(0.01)
+
     assert service.daemon.is_operational
     assert service.daemon.is_running
+
     await service.daemon.cancel()
     await asyncio.sleep(0.01)
+
     assert not service.is_operational
     assert not service.is_running
-    await service.events.cleaned_up.wait()
+
+    await asyncio.wait_for(service.events.cleaned_up.wait(), timeout=1)