Fix more fallout from move of p2p code to trinity (#1163)

Author: gsalgado

p2p/peer.py

@@ -1021,7 +1021,7 @@ def _test() -> None:
     from trinity.protocol.eth.requests import HeaderRequest as ETHHeaderRequest
     from trinity.protocol.les.peer import LESPeer
     from trinity.protocol.les.requests import HeaderRequest as LESHeaderRequest
-    from tests.p2p.integration_test_helpers import FakeAsyncHeaderDB, connect_to_peers_loop
+    from tests.trinity.core.integration_test_helpers import FakeAsyncHeaderDB, connect_to_peers_loop
     logging.basicConfig(level=TRACE_LEVEL_NUM, format='%(asctime)s %(levelname)s: %(message)s')
 
     parser = argparse.ArgumentParser()

trinity/server.py

@@ -302,7 +302,7 @@ def _test() -> None:
 
     from trinity.utils.chains import load_nodekey
 
-    from tests.p2p.integration_test_helpers import (
+    from tests.trinity.core.integration_test_helpers import (
         FakeAsyncLevelDB, FakeAsyncHeaderDB, FakeAsyncChainDB, FakeAsyncRopstenChain)
 
     parser = argparse.ArgumentParser()
@@ -318,7 +318,6 @@ def _test() -> None:
     log_level = logging.INFO
     if args.debug:
         log_level = logging.DEBUG
-    logging.getLogger('p2p.server.Server').setLevel(log_level)
 
     loop = asyncio.get_event_loop()
     db = FakeAsyncLevelDB(args.db)
@@ -353,6 +352,7 @@ def _test() -> None:
         peer_class=ETHPeer,
         bootstrap_nodes=bootstrap_nodes,
     )
+    server.logger.setLevel(log_level)
 
     sigint_received = asyncio.Event()
     for sig in [signal.SIGINT, signal.SIGTERM]:

trinity/sync/full/service.py

@@ -77,7 +77,7 @@ def _test() -> None:
     from p2p.kademlia import Node
     from p2p.peer import DEFAULT_PREFERRED_NODES
     from trinity.protocol.eth.peer import ETHPeer
-    from tests.p2p.integration_test_helpers import (
+    from tests.trinity.core.integration_test_helpers import (
         FakeAsyncChainDB, FakeAsyncRopstenChain, connect_to_peers_loop)
     logging.basicConfig(level=logging.INFO, format='%(asctime)s %(levelname)s: %(message)s')
 

trinity/sync/full/state.py

@@ -394,7 +394,7 @@ def _test() -> None:
     from p2p import ecies
     from p2p.kademlia import Node
     from p2p.peer import DEFAULT_PREFERRED_NODES
-    from tests.p2p.integration_test_helpers import (
+    from tests.trinity.core.integration_test_helpers import (
         FakeAsyncChainDB, FakeAsyncLevelDB, connect_to_peers_loop)
     logging.basicConfig(level=logging.INFO, format='%(asctime)s %(levelname)s: %(message)s')
 
@@ -407,7 +407,6 @@ def _test() -> None:
     log_level = logging.INFO
     if args.debug:
         log_level = logging.DEBUG
-    logging.getLogger('p2p.state.StateDownloader').setLevel(log_level)
 
     db = FakeAsyncLevelDB(args.db)
     chaindb = FakeAsyncChainDB(db)
@@ -423,6 +422,7 @@ def _test() -> None:
 
     head = chaindb.get_canonical_head()
     downloader = StateDownloader(chaindb, db, head.state_root, peer_pool)
+    downloader.logger.setLevel(log_level)
     loop = asyncio.get_event_loop()
 
     sigint_received = asyncio.Event()

trinity/utils/logging.py

@@ -97,7 +97,6 @@ def setup_queue_logging(log_queue: 'Queue[str]', level: int) -> None:
     # the INFO level for it until https://github.com/ethereum/py-evm/issues/806 is fixed.
     logging.getLogger('p2p.kademlia').setLevel(logging.INFO)
     logging.getLogger('p2p.discovery').setLevel(logging.INFO)
-    logging.getLogger('p2p.state.StateSync').setLevel(logging.ERROR)
     logger.debug('Logging initialized: PID=%s', os.getpid())