Merge pull request #1136 from pipermerriam/piper/continue-extraction-of-trinty-from-p2p-module

Finish moving trinity code from p2p module

Author: pipermerriam

p2p/chain.py

@@ -0,0 +1,20 @@
+import os
+import logging
+from concurrent.futures import Executor, ProcessPoolExecutor
+
+
+def get_asyncio_executor() -> Executor:
+    # Use CPU_COUNT - 1 processes to make sure we always leave one CPU idle so that it can run
+    # asyncio's event loop.
+    os_cpu_count = os.cpu_count()
+    if os_cpu_count in (None, 0):
+        # Need this because os.cpu_count() returns None when the # of CPUs is indeterminable.
+        logger = logging.getLogger('p2p.executor')
+        logger.warning(
+            "Could not determine number of CPUs, defaulting to 1 instead of %s",
+            os_cpu_count,
+        )
+        cpu_count = 1
+    else:
+        cpu_count = max(1, os_cpu_count - 1)
+    return ProcessPoolExecutor(cpu_count)

p2p/executor.py

@@ -1,8 +1,4 @@
-from concurrent.futures import Executor, ProcessPoolExecutor
 import datetime
-import logging
-import os
-import time
 from typing import Tuple
 
 import rlp
@@ -31,39 +27,8 @@ def get_devp2p_cmd_id(msg: bytes) -> int:
     return rlp.decode(msg[:1], sedes=rlp.sedes.big_endian_int)
 
 
-def get_asyncio_executor() -> Executor:
-    # Use CPU_COUNT - 1 processes to make sure we always leave one CPU idle so that it can run
-    # asyncio's event loop.
-    os_cpu_count = os.cpu_count()
-    if os_cpu_count in (None, 0):
-        # Need this because os.cpu_count() returns None when the # of CPUs is indeterminable.
-        logger = logging.getLogger('p2p.utils')
-        logger.warning(
-            f"Could not determine number of CPUs, defaulting to 1 instead of {os_cpu_count}"
-        )
-        cpu_count = 1
-    else:
-        cpu_count = max(1, os_cpu_count - 1)
-    return ProcessPoolExecutor(cpu_count)
-
-
 def time_since(start_time: datetime.datetime) -> Tuple[int, int, int, int]:
     delta = datetime.datetime.now() - start_time
     hours, remainder = divmod(delta.seconds, 3600)
     minutes, seconds = divmod(remainder, 60)
     return delta.days, hours, minutes, seconds
-
-
-class Timer:
-    _start: float = None
-
-    def __init__(self, auto_start: bool = True) -> None:
-        if auto_start:
-            self.start()
-
-    def start(self) -> None:
-        self._start = time.time()
-
-    @property
-    def elapsed(self) -> float:
-        return time.time() - self._start

p2p/rlp.py

@@ -23,23 +23,27 @@
 from eth.vm.forks.spurious_dragon import SpuriousDragonVM
 
 
+LOGGING_NAMESPACES = ('eth', 'p2p', 'trinity')
+
+
 @pytest.fixture(autouse=True, scope="session")
-def vm_logger():
-    logger = logging.getLogger('eth')
+def vm_logger(namespaces=LOGGING_NAMESPACES):
+    for namespace in namespaces:
+        logger = logging.getLogger(namespace)
 
-    handler = logging.StreamHandler(sys.stdout)
+        handler = logging.StreamHandler(sys.stdout)
 
-    # level = TRACE_LEVEL_NUM
-    # level = logging.DEBUG
-    # level = logging.INFO
-    level = logging.ERROR
+        # level = TRACE_LEVEL_NUM
+        # level = logging.DEBUG
+        # level = logging.INFO
+        level = logging.ERROR
 
-    logger.setLevel(level)
-    handler.setLevel(level)
+        logger.setLevel(level)
+        handler.setLevel(level)
 
-    logger.addHandler(handler)
+        logger.addHandler(handler)
 
-    return logger
+        return logger
 
 
 # Uncomment this to have logs from tests written to a file.  This is useful for

p2p/sedes.py

@@ -1,11 +1,6 @@
 import pytest
 
 
-def pytest_addoption(parser):
-    parser.addoption("--enode", type=str, required=False)
-    parser.addoption("--integration", action="store_true", default=False)
-
-
 """
 # Uncomment the following lines to globally change the logging level for all
 # `p2p` namespaced loggers.  Useful for debugging failing tests in async code

p2p/utils.py

@@ -17,18 +17,19 @@
     HandshakeInitiator,
     HandshakeResponder,
 )
-from p2p.server import decode_authentication
+from p2p.auth import decode_authentication
 
 from auth_constants import (
     eip8_values,
     test_values,
 )
-from dumb_peer import DumbPeer
-from peer_helpers import MockStreamWriter
+from tests.trinity.core.dumb_peer import DumbPeer
+from tests.trinity.core.peer_helpers import MockStreamWriter
 
 
 @pytest.mark.asyncio
 async def test_handshake():
+    # TODO: this test should be re-written to not depend on functionality in the `ETHPeer` class.
     cancel_token = CancelToken("test_handshake")
     use_eip8 = False
     initiator_remote = kademlia.Node(

tests/conftest.py

@@ -6,16 +6,16 @@
 import uuid
 
 from p2p.peer import PeerPool
-from p2p.server import (
-    Server
-)
 
 from trinity.rpc.main import (
     RPCServer,
 )
 from trinity.rpc.ipc import (
     IPCServer,
 )
+from trinity.server import (
+    Server
+)
 from trinity.utils.xdg import (
     get_xdg_trinity_root,
 )
@@ -24,6 +24,11 @@
 )
 
 
+def pytest_addoption(parser):
+    parser.addoption("--enode", type=str, required=False)
+    parser.addoption("--integration", action="store_true", default=False)
+
+
 @pytest.fixture(autouse=True)
 def xdg_trinity_root(monkeypatch, tmpdir):
     """

tests/p2p/conftest.py

@@ -1,4 +1,5 @@
 from p2p import protocol
+
 from trinity.protocol.eth.peer import (
     ETHPeer,
 )