Remove event loop parameter

Author: kclowes

setup.py

@@ -90,10 +90,7 @@
         "requests>=2.16.0,<3.0.0",
         # remove typing_extensions after python_requires>=3.8, see web3._utils.compat
         "typing-extensions>=3.7.4.1,<5;python_version<'3.8'",
-        # websockets 10.0 removed support for python 3.6.
-        # We can remove this line once we drop 3.6 support as well
-        "websockets>=9.1,<10;python_version<'3.7'",
-        "websockets>=9.1,<11;python_version>'3.6'",
+        "websockets>=10.0.0,<11",
     ],
     python_requires='>=3.6,<4',
     extras_require=extras_require,

tests/core/providers/test_websocket_provider.py

@@ -37,7 +37,7 @@ async def empty_server(websocket, path):
             data = await websocket.recv()
             await asyncio.sleep(0.02)
             await websocket.send(data)
-        server = websockets.serve(empty_server, '127.0.0.1', open_port, loop=event_loop)
+        server = websockets.serve(empty_server, '127.0.0.1', open_port)
         event_loop.run_until_complete(server)
         event_loop.run_forever()
 

tests/integration/go_ethereum/test_goethereum_ws.py

@@ -1,3 +1,4 @@
+import asyncio
 import pytest
 
 from tests.integration.common import (
@@ -63,8 +64,9 @@ def geth_command_arguments(geth_binary,
 
 
 @pytest.fixture(scope="module")
-def web3(geth_process, endpoint_uri, event_loop):
-    event_loop.run_until_complete(wait_for_ws(endpoint_uri, event_loop))
+def web3(geth_process, endpoint_uri):
+    event_loop = asyncio.new_event_loop()
+    event_loop.run_until_complete(wait_for_ws(endpoint_uri))
     _web3 = Web3(Web3.WebsocketProvider(endpoint_uri, websocket_timeout=30))
     return _web3
 

tests/utils.py

@@ -13,11 +13,11 @@ def get_open_port():
     return str(port)
 
 
-async def wait_for_ws(endpoint_uri, event_loop, timeout=60):
+async def wait_for_ws(endpoint_uri, timeout=60):
     start = time.time()
     while time.time() < start + timeout:
         try:
-            async with websockets.connect(uri=endpoint_uri, loop=event_loop):
+            async with websockets.connect(uri=endpoint_uri):
                 pass
         except (ConnectionRefusedError, OSError):
             await asyncio.sleep(0.01)

web3/providers/websocket.py

@@ -60,17 +60,16 @@ def get_default_endpoint() -> URI:
 class PersistentWebSocket:
 
     def __init__(
-        self, endpoint_uri: URI, loop: asyncio.AbstractEventLoop, websocket_kwargs: Any
+        self, endpoint_uri: URI, websocket_kwargs: Any
     ) -> None:
         self.ws: WebSocketClientProtocol = None
         self.endpoint_uri = endpoint_uri
-        self.loop = loop
         self.websocket_kwargs = websocket_kwargs
 
     async def __aenter__(self) -> WebSocketClientProtocol:
         if self.ws is None:
             self.ws = await connect(
-                uri=self.endpoint_uri, loop=self.loop, **self.websocket_kwargs
+                uri=self.endpoint_uri, **self.websocket_kwargs
             )
         return self.ws
 
@@ -113,7 +112,7 @@ def __init__(
                     'found: {1}'.format(RESTRICTED_WEBSOCKET_KWARGS, found_restricted_keys)
                 )
         self.conn = PersistentWebSocket(
-            self.endpoint_uri, WebsocketProvider._loop, websocket_kwargs
+            self.endpoint_uri, websocket_kwargs
         )
         super().__init__()
 

web3/tools/benchmark/main.py

@@ -120,7 +120,7 @@ def main(logger: logging.Logger, num_calls: int) -> None:
     for built_fixture in fixture.build():
         for process in built_fixture:
             w3_http = build_web3_http(fixture.endpoint_uri)
-            loop = asyncio.get_event_loop()
+            loop = asyncio.get_running_loop()
             async_w3_http = loop.run_until_complete(build_async_w3_http(fixture.endpoint_uri))
             # TODO: swap out w3_http for the async_w3_http once GethPersonal module is async
             async_unlocked_acct = loop.run_until_complete(